{"header":{"message":"Updating Pijul with the latest changes in Libpijul","description":null,"timestamp":"2021-07-10T21:41:25.123131556Z","authors":[{}]},"hash":"EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["AA",null],["NHO3QO3WZTJBRPGIQVLNPHUYAB6YMTDOPHNGGTYVPSTP47TBQJ2AC","Return a clean error instead of a panic when the channel for a commit is not found in `pijul git`"],["WQQJLPTXGJGK2LPRV633QTPLDXE4E5N7GQ4Y7FOLSFTJBWF6GHRQC","Fix the comparison between channels states when one is empty"],["NEJOYVJB4VXJJPFBWD2YK7PK6KKHQGRHIJHLEJ53HLQ3ZQRE5EPQC","Fixing the Git feature"],["L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC","Downloading changelists from channels without an id (Nest discussions)"],["DX2FO4HZDTTBU436YRPQW3MIIVFB3ZFSZ3SI5GYLTIWCIGRTQ6DAC","Tag CLI cleanup"],["HQ2C4VT5O2IOUAQQTEAF7VIFNJFOZWBW2R5ACLK3TD4YZUXNZ77QC","Pull: confusion between from and to channels"],["RG4YZPKLWZXRNROBZQD4OLWMF46JPZC4WAM3Q6DBLDQYLL4QNQBQC","file_operations: remove the counter-intuitive --repository options"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","Fixing `pijul git`"],["BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","Completing dependencies only with changes the remote does not have"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","Exit with an error when a change could not be signed"],["V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","Using path-slash to fix path issues on Windows"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["3FTEGCMRMELPIJRUKNKRTA5TDBXEOTOOVRUTZJ7DWD27ZTKKMV3QC","add timestamp_validator to tag --timestamp option"],["SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","Converting to the new patch format \"online\""],["Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","Fix path prefix striping on Windows."],["BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","Friendlier progress bars"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["3MHUNYERBYLR5FOB7YJZINOFKXSXMLGBF5F6UR2MKNYYODIJIFGQC","Changing --amend flag to respect -m flag"],["4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","Correct handling of ignore files"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","commands: set up pager for diff, change, and credit"],["A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","Fixing a panic in `pijul change`"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"],["L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","Fixing the Git feature"],["I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","Minor cleanup"],["KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","Adding extra dependencies from the config file"],["QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","Reset: only output changed files"],["4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","Recursive add"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["YDTN6BGI5TFRJFM3N3Y2J463GKFHU5L3DPBQXBDIQJDWXU5ELKMQC","Touch the channel if no file was changed"],["GJNJ75U5ADCWNMLPBRM4FMYV6KJ366YLN5C7PWPZX3C5CWE5HZZQC","Canonicalise paths (reset and credit) before stripping off the prefix"],["XSRTXUAS3DXJA42TZESMETFVTKU2OBUDGDE4N5F2CVWI4CLOUJ4AC","Pull: show progress bar when applying"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["MFTN7GBWZNQAFHKER57MLZAJGVEAHV2GYAQN2QTDHTPCEURDVIGQC","Pre-tags cleanup + fast Sanakirja"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["QWD7UE766WLJ3JZU7L2UXMV7Q236DSDMH2CCI4M6HIA4QA3QVFAQC","push/pull: rename `channel` option"],["6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","Current state: return zero instead of an Option if there is no change on the channel"],["EEOOHGQQK43J36LQJDSS3UK56M54DXPYE4VB3K4A2XAYGOYDJAXAC","More atomic \"file moves+transaction\""],["F6V27C3M7GZHBHXMGAZMYO5XGWDYYNNIF2HLDE2VPNHTEVDSYGVQC","Fixing the \"old file optimisation\" in record, after the move to parallelisable records"],["VU4KVXHWMLZCJJDO3DDUTNTYUDCDD7RSJ3QJ67EMNZV44H2YIKSAC","Git import was importing parents and hidden files (including .git), in some cases"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC","When clone fails, only remove directories we have created (not other directories)"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["K7JPP64SNKZNMB6XJAYYHDC2464I3BQDLVA3IX4YCQZ4P5TXZXRAC","Faster error in unrecord when the change is not on the channel"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["ZZXBHCN3WGJG26SBKZP3ZG4FYUKY7WK2EDSDXLDMQLK7PDKXISPQC","fixing the protocol"],["ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","Fixing a bus error when starting a transaction on a full disk"],["NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","Credit and reset relative to current directory instead of the root"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","Fixing log --hash-only"],["MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","commands/record: amend current change if unspecified"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["PGERZ3KJIQIREXAYLKLZR4526X5RPKIA6LSVZL2DGYQ5UVPIIBUQC","Channel renaming (also do not create a new channel when recording on a channel that doesn't exist)"],["UCQD3JDHULGTUSKWPD3I4FQHA2DX37X7MMHRCOPGQVOT65JWWCIQC","Fix build errors caused by sanakirja 0.14"],["MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Fix a panic when switching between channels that have different files"],["AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","Tags: completing the subcommand"],["MHQBEHJDJ7MUW46HIS24AZFBC4DZDKZNBVBOBOBPML6GGFIS4LQAC","unrecord --reset without a pending change"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","Unrecording changes atomically"],["M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","Complete dependencies when pushing and pulling"],["VL7ZYKHBPKLNY5SA5QBW56SJ7LBBCKCGV5UAYLVF75KY6PPBOD4AC","Running hooks through shell on Windows and Unix"],["BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","Deterministic Git import"],["G7VOM2IMN4SOHOOCFLMNPKTU5DB5EEJMK7SSBA3DLWWXFA672RUAC","Returning an error when recording non-existent paths"],["CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","Fixing git import, and adding more useful feedback (with `RUST_LOG=\"pijul=info\"`)"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["EGSVRZJVIBSPYAI65A25CH5RYAGL4PUP3B24VSRUS3M4WIUCZWHAC","Avoid converting between base32 and hash in pijul::commands::unrecord"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","Progress bar for upload and apply"],["LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","Avoid cloning into an existing path"],["OWCCRVO5LMF3AJ6CU76UOT6HS2VNGI6O3LGTTYQBKZLPCCRNETXQC","Fixing a broken pipe in credit"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","Do not output files introduced by patches that were not applied during a push"],["3AZB5NUOZ3PEP5RX2M2QKA4OVAF6AIXQZ6GH4D6W3JK7UFCLA2RQC","Fixing the Git feature"],["5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","push/pull: fixed \"changes\" arguments"],["5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","Hard-unrecord"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["HWH4WWN3XZ4GWP225GVTW4IYZIEFMQLKZZOMMEGZVSRGWYUE6MMAC","Proper separation of Git commit messages into a message and description fields in changes"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","Support for staging"],["HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","Version bump + formatting"],["BBKV6VMN4EVBCBSAQMTL2TARBBSQEZGRCXMTKYUIDOJ3HZISUP7AC","Fixing push/pull messages, and do not reverse the changes to download/upload"],["GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","Cursors cleanup"],["WW2EOFBBX6LGMMRKEVGST2SIITJGMK2MTYDAHUTO6QGYPS2JATLQC","Umask in archives"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"],["WTRH4B2XODLZWSRMB5CCQAKDQLAXGOY2CEEABXGXEUJLZI4OX2QQC","Formatting"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","Don't output after pushing to a local channel"],["QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","Fixing asynchronicity problems in SSH"]],"deps":["NHO3QO3WZTJBRPGIQVLNPHUYAB6YMTDOPHNGGTYVPSTP47TBQJ2AC","WQQJLPTXGJGK2LPRV633QTPLDXE4E5N7GQ4Y7FOLSFTJBWF6GHRQC","NEJOYVJB4VXJJPFBWD2YK7PK6KKHQGRHIJHLEJ53HLQ3ZQRE5EPQC","L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC","DX2FO4HZDTTBU436YRPQW3MIIVFB3ZFSZ3SI5GYLTIWCIGRTQ6DAC","HQ2C4VT5O2IOUAQQTEAF7VIFNJFOZWBW2R5ACLK3TD4YZUXNZ77QC","RG4YZPKLWZXRNROBZQD4OLWMF46JPZC4WAM3Q6DBLDQYLL4QNQBQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","UCQD3JDHULGTUSKWPD3I4FQHA2DX37X7MMHRCOPGQVOT65JWWCIQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","GJNJ75U5ADCWNMLPBRM4FMYV6KJ366YLN5C7PWPZX3C5CWE5HZZQC","M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","QE64ATLZWMKHYABCD3VA547PYXCK6YN3K7RE2TX3SCQNKG7XLVAQC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","QWD7UE766WLJ3JZU7L2UXMV7Q236DSDMH2CCI4M6HIA4QA3QVFAQC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","BBKV6VMN4EVBCBSAQMTL2TARBBSQEZGRCXMTKYUIDOJ3HZISUP7AC","A6R6SGCPLFM45QNWJLISFBR3EEXVITYHCWEUOPNH4UIGIWJRTZAQC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","3MHUNYERBYLR5FOB7YJZINOFKXSXMLGBF5F6UR2MKNYYODIJIFGQC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","LYTVEPH3W5UHF7MAYFWBT6NVNC42HEVKJGGMFDKUDZDNDOI33YJQC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","MHQBEHJDJ7MUW46HIS24AZFBC4DZDKZNBVBOBOBPML6GGFIS4LQAC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","EGSVRZJVIBSPYAI65A25CH5RYAGL4PUP3B24VSRUS3M4WIUCZWHAC","RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","ZZXBHCN3WGJG26SBKZP3ZG4FYUKY7WK2EDSDXLDMQLK7PDKXISPQC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC","VL7ZYKHBPKLNY5SA5QBW56SJ7LBBCKCGV5UAYLVF75KY6PPBOD4AC","L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","OU243LABJJZ3MQHYW2A2MYKW7KZLTZGHJJXDR2BIIIHXT5BSYN3AC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","YDTN6BGI5TFRJFM3N3Y2J463GKFHU5L3DPBQXBDIQJDWXU5ELKMQC","GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","XSRTXUAS3DXJA42TZESMETFVTKU2OBUDGDE4N5F2CVWI4CLOUJ4AC","PGERZ3KJIQIREXAYLKLZR4526X5RPKIA6LSVZL2DGYQ5UVPIIBUQC","ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","WW2EOFBBX6LGMMRKEVGST2SIITJGMK2MTYDAHUTO6QGYPS2JATLQC","3AZB5NUOZ3PEP5RX2M2QKA4OVAF6AIXQZ6GH4D6W3JK7UFCLA2RQC","MFTN7GBWZNQAFHKER57MLZAJGVEAHV2GYAQN2QTDHTPCEURDVIGQC","EEOOHGQQK43J36LQJDSS3UK56M54DXPYE4VB3K4A2XAYGOYDJAXAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","F6V27C3M7GZHBHXMGAZMYO5XGWDYYNNIF2HLDE2VPNHTEVDSYGVQC","K7JPP64SNKZNMB6XJAYYHDC2464I3BQDLVA3IX4YCQZ4P5TXZXRAC","G7VOM2IMN4SOHOOCFLMNPKTU5DB5EEJMK7SSBA3DLWWXFA672RUAC","V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","VU4KVXHWMLZCJJDO3DDUTNTYUDCDD7RSJ3QJ67EMNZV44H2YIKSAC","HWH4WWN3XZ4GWP225GVTW4IYZIEFMQLKZZOMMEGZVSRGWYUE6MMAC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","OWCCRVO5LMF3AJ6CU76UOT6HS2VNGI6O3LGTTYQBKZLPCCRNETXQC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","3FTEGCMRMELPIJRUKNKRTA5TDBXEOTOOVRUTZJ7DWD27ZTKKMV3QC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","WTRH4B2XODLZWSRMB5CCQAKDQLAXGOY2CEEABXGXEUJLZI4OX2QQC"]},"hunks":[{"Edit":{"inode":{"change":9,"pos":21431},"path":"pijul/src/repository.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":21540},"to":{"change":9,"start":0,"end":20},"introduced_by":9}],"inode":{"change":9,"pos":21431}}},"contents":[{"Del":"use std::sync::Arc;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":21431},"path":"pijul/src/repository.rs","line":11,"ins":{"up_context":[{"change":9,"pos":21688}],"down_context":[{"change":9,"pos":21758}],"flag":"BLOCK","start":0,"end":70,"inode":{"change":9,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":21688},"to":{"change":9,"start":21,"end":96},"introduced_by":9}],"inode":{"change":9,"pos":21431}},"ins_contents":[{"Add":" pub working_copy: libpijul::working_copy::filesystem::FileSystem,"}],"del_contents":[{"Del":" pub working_copy: Arc,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":21431},"path":"pijul/src/repository.rs","line":72,"ins":{"up_context":[{"change":9,"pos":5906}],"down_context":[{"change":9,"pos":24052}],"flag":"BLOCK","start":71,"end":156,"inode":{"change":9,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":5906},"to":{"change":9,"start":247,"end":341},"introduced_by":9}],"inode":{"change":9,"pos":21431}},"ins_contents":[{"Add":" working_copy: libpijul::working_copy::filesystem::FileSystem::from_root("}],"del_contents":[{"Del":" working_copy: Arc::new(libpijul::working_copy::filesystem::FileSystem::from_root(\n"}]}},{"Replacement":{"inode":{"change":9,"pos":21431},"path":"pijul/src/repository.rs","line":74,"ins":{"up_context":[{"change":9,"pos":24087}],"down_context":[{"change":9,"pos":24102}],"flag":"BLOCK","start":157,"end":172,"inode":{"change":9,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":24087},"to":{"change":9,"start":342,"end":358},"introduced_by":9}],"inode":{"change":9,"pos":21431}},"ins_contents":[{"Add":" ),"}],"del_contents":[{"Del":" )),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":21431},"path":"pijul/src/repository.rs","line":98,"ins":{"up_context":[{"change":9,"pos":6006}],"down_context":[{"change":9,"pos":25068}],"flag":"BLOCK","start":173,"end":268,"inode":{"change":9,"pos":21431}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":6006},"to":{"change":9,"start":359,"end":503},"introduced_by":9}],"inode":{"change":9,"pos":21431}},"ins_contents":[{"Add":" working_copy: libpijul::working_copy::filesystem::FileSystem::from_root(&cur),"}],"del_contents":[{"Del":" working_copy: Arc::new(libpijul::working_copy::filesystem::FileSystem::from_root(\n &cur,\n )),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":176,"ins":{"up_context":[{"change":9,"pos":57008}],"down_context":[{"change":9,"pos":57072}],"flag":"BLOCK","start":269,"end":331,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":57008},"to":{"change":9,"start":504,"end":567},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" .dichotomy_changelist(txn, &remote.lock().remote)"}],"del_contents":[{"Del":" .dichotomy_changelist(txn, &remote.lock()?.remote)\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":180,"ins":{"up_context":[{"change":9,"pos":57166}],"down_context":[{"change":9,"pos":8398}],"flag":"BLOCK","start":332,"end":384,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":57166},"to":{"change":9,"start":568,"end":621},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" .iter_remote(&remote.lock().remote, n)?"}],"del_contents":[{"Del":" .iter_remote(&remote.lock()?.remote, n)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":276,"ins":{"up_context":[{"change":9,"pos":7116}],"down_context":[{"change":9,"pos":2110}],"flag":"BLOCK","start":385,"end":441,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7116},"to":{"change":9,"start":7116,"end":7181},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" Ok(Some(*txn.id(&*channel.read())))"}],"del_contents":[{"Del":" Ok(Some(*txn.id(&*channel.read().unwrap())))\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":424,"ins":{"up_context":[{"change":9,"pos":7708}],"down_context":[{"change":5,"pos":1701}],"flag":"BLOCK","start":442,"end":477,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7708},"to":{"change":5,"start":1665,"end":1701},"introduced_by":5}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" remote.set_id_revision(r);"}],"del_contents":[{"Del":" remote.set_id_revision(r)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":525,"ins":{"up_context":[{"change":9,"pos":3600}],"down_context":[{"change":9,"pos":60}],"flag":"BLOCK","start":478,"end":529,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3600},"to":{"change":9,"start":0,"end":60},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" let mut channel = channel.write();"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":598,"ins":{"up_context":[{"change":9,"pos":150}],"down_context":[{"change":9,"pos":207}],"flag":"BLOCK","start":530,"end":578,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":150},"to":{"change":9,"start":150,"end":207},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" let mut channel_ = channel.write();"}],"del_contents":[{"Del":" let mut channel_ = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":622,"ins":{"up_context":[{"change":9,"pos":74338}],"down_context":[{"change":9,"pos":7808}],"flag":"BLOCK","start":579,"end":641,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":74338},"to":{"change":9,"start":622,"end":685},"introduced_by":9}],"inode":{"change":9,"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.lock()?.remote, 0)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":701,"ins":{"up_context":[{"change":9,"pos":76875}],"down_context":[{"change":9,"pos":2348}],"flag":"BLOCK","start":642,"end":690,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":76875},"to":{"change":9,"start":686,"end":735},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" let channel = local_channel.read();"}],"del_contents":[{"Del":" let channel = local_channel.read()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":730,"ins":{"up_context":[{"change":9,"pos":77979}],"down_context":[{"change":9,"pos":78300}],"flag":"BLOCK","start":691,"end":871,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":78229},"to":{"change":9,"start":2758,"end":2802},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":2802},"to":{"change":9,"start":2883,"end":2988},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2883},"to":{"change":9,"start":2883,"end":2988},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" let (inodes, remote_changes) = if let Some(x) = self.update_changelist(txn, path).await? {"},{"Add":" x"},{"Add":" } else {"},{"Add":" bail!(\"Channel not found\")"},{"Add":" };"}],"del_contents":[{"Del":" let (inodes, remote_changes) = self\n"},{"Del":" .update_changelist(txn, path)\n .await?\n .expect(\"Remote is not self\");\n"}]}},{"Replacement":{"inode":{"change":9,"pos":52474},"path":"pijul/src/remote/mod.rs","line":737,"ins":{"up_context":[{"change":9,"pos":8218}],"down_context":[{"change":9,"pos":8264}],"flag":"BLOCK","start":872,"end":917,"inode":{"change":9,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8218},"to":{"change":9,"start":8218,"end":8264},"introduced_by":9}],"inode":{"change":9,"pos":52474}},"ins_contents":[{"Add":" let rem = remote_changes.lock();"}],"del_contents":[{"Del":" let rem = remote_changes.lock()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":3,"ins":{"up_context":[{"change":9,"pos":11587}],"down_context":[{"change":9,"pos":534}],"flag":"BLOCK","start":918,"end":938,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":11587},"to":{"change":9,"start":808,"end":838},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":27,"ins":{"up_context":[{"change":9,"pos":3239}],"down_context":[{"change":9,"pos":10054}],"flag":"BLOCK","start":939,"end":1008,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3239},"to":{"change":9,"start":839,"end":909},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" Ok(txn.reverse_log(&*channel.read(), None)?.next().map(|n| {"}],"del_contents":[{"Del":" Ok(txn.reverse_log(&*channel.read()?, None)?.next().map(|n| {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":44,"ins":{"up_context":[{"change":9,"pos":8812}],"down_context":[{"change":9,"pos":8869}],"flag":"BLOCK","start":1009,"end":1057,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8812},"to":{"change":9,"start":8812,"end":8869},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" Ok(Some(*txn.id(&*channel.read())))"}],"del_contents":[{"Del":" Ok(Some(*txn.id(&*channel.read().unwrap())))\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":84,"ins":{"up_context":[{"change":9,"pos":10533}],"down_context":[{"change":9,"pos":10589}],"flag":"BLOCK","start":1058,"end":1112,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":10533},"to":{"change":9,"start":910,"end":965},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" &remote_channel.read().graph,"}],"del_contents":[{"Del":" &remote_channel.read()?.graph,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":93,"ins":{"up_context":[{"change":9,"pos":8962}],"down_context":[{"change":9,"pos":10768}],"flag":"BLOCK","start":1113,"end":1179,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":8962},"to":{"change":9,"start":966,"end":1033},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4961},"to":{"change":9,"start":966,"end":1033},"introduced_by":9}],"inode":{"change":9,"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.read()?, from)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":119,"ins":{"up_context":[{"change":9,"pos":82358}],"down_context":[{"change":9,"pos":82557}],"flag":"BLOCK","start":1180,"end":1352,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":82358},"to":{"change":9,"start":64,"end":118},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":118},"to":{"change":9,"start":82411,"end":82503},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":82411},"to":{"change":9,"start":82411,"end":82503},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" let txn = self.pristine.arc_txn_begin()?;"},{"Add":" let channel = txn"},{"Add":" .write()"},{"Add":" .open_or_create_channel(to_channel.unwrap_or(&self.channel))?;"}],"del_contents":[{"Del":" let mut txn = self.pristine.mut_txn_begin()?;\n"},{"Del":" let mut channel = txn.open_or_create_channel(to_channel.unwrap_or(&self.channel))?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":138,"ins":{"up_context":[{"change":9,"pos":1124}],"down_context":[{"change":9,"pos":1204}],"flag":"BLOCK","start":1353,"end":1424,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":1124},"to":{"change":9,"start":0,"end":66},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":83322},"to":{"change":9,"start":0,"end":66},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":66},"to":{"change":9,"start":1125,"end":1204},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" upload_changes(&store, &mut *txn.write(), &channel, changes)?;"}],"del_contents":[{"Del":" upload_changes(&store, &mut txn, &mut channel, changes)?;\n"},{"Del":" let txn = Arc::new(RwLock::new(txn));\n let wc = Arc::new(repo);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":140,"ins":{"up_context":[{"change":9,"pos":1260}],"down_context":[{"change":9,"pos":1276}],"flag":"BLOCK","start":1425,"end":1444,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1260},"to":{"change":9,"start":1260,"end":1276},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" wc,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":142,"ins":{"up_context":[{"change":9,"pos":1296}],"down_context":[{"change":9,"pos":1350}],"flag":"BLOCK","start":1445,"end":1485,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1296},"to":{"change":9,"start":1296,"end":1350},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Edit":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":150,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1443},"to":{"change":9,"start":1443,"end":1594},"introduced_by":9}],"inode":{"change":9,"pos":79745}}},"contents":[{"Del":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}},{"Replacement":{"inode":{"change":9,"pos":79745},"path":"pijul/src/remote/local.rs","line":224,"ins":{"up_context":[{"change":9,"pos":4093}],"down_context":[{"change":9,"pos":4093}],"flag":"BLOCK","start":1486,"end":1525,"inode":{"change":9,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4093},"to":{"change":9,"start":395,"end":443},"introduced_by":9}],"inode":{"change":9,"pos":79745}},"ins_contents":[{"Add":" let mut channel = channel.write();"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Edit":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":95785},"to":{"change":9,"start":1929,"end":1959},"introduced_by":9}],"inode":{"change":9,"pos":95630}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":37,"ins":{"up_context":[{"change":9,"pos":96273}],"down_context":[{"change":9,"pos":75}],"flag":"BLOCK","start":1526,"end":1722,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":362},"to":{"change":9,"start":1960,"end":2010},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2010},"to":{"change":9,"start":0,"end":75},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let cur = txn"},{"Add":" .read()"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}],"del_contents":[{"Del":" let txn = repo.pristine.mut_txn_begin()?;\n"},{"Del":" let cur = txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":46,"ins":{"up_context":[{"change":9,"pos":169}],"down_context":[{"change":9,"pos":185}],"flag":"BLOCK","start":1723,"end":1748,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":169},"to":{"change":9,"start":169,"end":185},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" cur.as_str()"}],"del_contents":[{"Del":" cur\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":49,"ins":{"up_context":[{"change":9,"pos":250}],"down_context":[{"change":9,"pos":2089}],"flag":"BLOCK","start":1749,"end":1836,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":250},"to":{"change":9,"start":250,"end":330},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.read().load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(&channel_name)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":72,"ins":{"up_context":[{"change":9,"pos":2791}],"down_context":[{"change":9,"pos":3331}],"flag":"BLOCK","start":1837,"end":1871,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2791},"to":{"change":9,"start":0,"end":43},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":74,"ins":{"up_context":[{"change":9,"pos":3361}],"down_context":[{"change":9,"pos":3416}],"flag":"BLOCK","start":1872,"end":1926,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3361},"to":{"change":9,"start":3361,"end":3416},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" .reverse_log(&*channel.read(), None)?"}],"del_contents":[{"Del":" .reverse_log(&*channel.read()?, None)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":83,"ins":{"up_context":[{"change":9,"pos":3800}],"down_context":[{"change":9,"pos":3800}],"flag":"BLOCK","start":1927,"end":1961,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3800},"to":{"change":9,"start":44,"end":87},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":89,"ins":{"up_context":[{"change":9,"pos":3958}],"down_context":[{"change":9,"pos":3998}],"flag":"BLOCK","start":1962,"end":2001,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3958},"to":{"change":9,"start":3958,"end":3998},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" let channel_ = channel.read();"}],"del_contents":[{"Del":" let channel_ = channel.read()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":92,"ins":{"up_context":[{"change":9,"pos":98}],"down_context":[{"change":9,"pos":141}],"flag":"BLOCK","start":2002,"end":2036,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":98},"to":{"change":9,"start":98,"end":141},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":112,"ins":{"up_context":[{"change":9,"pos":4436}],"down_context":[{"change":9,"pos":755}],"flag":"BLOCK","start":2037,"end":2115,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4436},"to":{"change":9,"start":4436,"end":4480},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4480},"to":{"change":9,"start":711,"end":755},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" let channel_ = channel.read();"},{"Add":" let txn_ = txn.read();"}],"del_contents":[{"Del":" let channel_ = channel.read()?;\n"},{"Del":" let txn_ = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":139,"ins":{"up_context":[{"change":9,"pos":998}],"down_context":[{"change":9,"pos":5477}],"flag":"BLOCK","start":2116,"end":2186,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":998},"to":{"change":9,"start":0,"end":113},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" txn.write().unrecord(&repo.changes, &channel, &hash, 0)?;"}],"del_contents":[{"Del":" txn.write()\n .unwrap()\n .unrecord(&repo.changes, &channel, &hash, 0)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":144,"ins":{"up_context":[{"change":9,"pos":5640}],"down_context":[{"change":9,"pos":5683}],"flag":"BLOCK","start":2187,"end":2223,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":5640},"to":{"change":9,"start":5640,"end":5683},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":146,"ins":{"up_context":[{"change":9,"pos":5714}],"down_context":[{"change":9,"pos":5776}],"flag":"BLOCK","start":2224,"end":2272,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":5714},"to":{"change":9,"start":5714,"end":5776},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":156,"ins":{"up_context":[{"change":9,"pos":5939}],"down_context":[{"change":9,"pos":6012}],"flag":"BLOCK","start":2273,"end":2340,"inode":{"change":9,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":5939},"to":{"change":9,"start":114,"end":224},"introduced_by":9}],"inode":{"change":9,"pos":95630}},"ins_contents":[{"Add":" txn.write().unrecord(&repo.changes, &channel, &h, 0)?;"}],"del_contents":[{"Del":" txn.write()\n .unwrap()\n .unrecord(&repo.changes, &channel, &h, 0)?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":161,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":97592},"to":{"change":9,"start":6107,"end":6258},"introduced_by":9}],"inode":{"change":9,"pos":95630}}},"contents":[{"Del":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}},{"Edit":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":165,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2195},"to":{"change":9,"start":2195,"end":2241},"introduced_by":9}],"inode":{"change":9,"pos":95630}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"SolveOrderConflict":{"inode":{"change":9,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":165,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":97638}],"down_context":[],"flag":"","start":2341,"end":2341,"inode":{"change":9,"pos":95630}}},"contents":[]}},{"Edit":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":119},"to":{"change":9,"start":119,"end":149},"introduced_by":9}],"inode":{"change":9,"pos":74}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":9,"ins":{"up_context":[{"change":9,"pos":255}],"down_context":[{"change":6,"pos":0}],"flag":"BLOCK","start":2342,"end":2427,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":255},"to":{"change":9,"start":255,"end":332},"introduced_by":9}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":"use libpijul::{ArcTxn, Base32, ChannelMutTxnT, ChannelTxnT, MutTxnT, TxnT, TxnTExt};"}],"del_contents":[{"Del":"use libpijul::{Base32, ChannelMutTxnT, ChannelTxnT, MutTxnT, TxnT, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":61,"ins":{"up_context":[{"change":9,"pos":92}],"down_context":[{"change":6,"pos":71}],"flag":"BLOCK","start":2428,"end":2486,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":92},"to":{"change":6,"start":13,"end":71},"introduced_by":6}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"}],"del_contents":[{"Del":" let txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":65,"ins":{"up_context":[{"change":9,"pos":506}],"down_context":[{"change":6,"pos":176}],"flag":"BLOCK","start":2487,"end":2561,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":506},"to":{"change":6,"start":134,"end":176},"introduced_by":6}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" txn.read()"},{"Add":" .current_channel()"}],"del_contents":[{"Del":" txn.current_channel()\n"}]}},{"Edit":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":71,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334},"to":{"change":6,"start":334,"end":388},"introduced_by":6}],"inode":{"change":9,"pos":74}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":72,"ins":{"up_context":[{"change":6,"pos":456}],"down_context":[{"change":9,"pos":2305}],"flag":"BLOCK","start":2562,"end":2761,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":456},"to":{"change":6,"start":456,"end":651},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":651},"to":{"change":9,"start":2135,"end":2305},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2135},"to":{"change":9,"start":2135,"end":2305},"introduced_by":9}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" let channel = txn.read().load_channel(&channel_name)?.unwrap();"},{"Add":" let last_t = if let Some(n) = txn.read().reverse_log(&*channel.read(), None)?.next()"},{"Add":" {"}],"del_contents":[{"Del":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"},{"Del":" let channel = txn.load_channel(&channel_name)?.unwrap();\n let last_t = if let Some(n) = txn.reverse_log(&*channel.read()?, None)?.next() {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":80,"ins":{"up_context":[{"change":9,"pos":2499}],"down_context":[{"change":9,"pos":2576}],"flag":"BLOCK","start":2762,"end":2924,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2499},"to":{"change":9,"start":2499,"end":2576},"introduced_by":9}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" if txn"},{"Add":" .read()"},{"Add":" .get_tags(&channel.read().tags, &last_t)?"},{"Add":" .is_some()"},{"Add":" {"}],"del_contents":[{"Del":" if txn.get_tags(&channel.read()?.tags, &last_t)?.is_some() {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":96,"ins":{"up_context":[{"change":9,"pos":3053}],"down_context":[{"change":9,"pos":3145}],"flag":"BLOCK","start":2925,"end":3025,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3053},"to":{"change":9,"start":3053,"end":3145},"introduced_by":9}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" let h = libpijul::tag::from_channel(&*txn.read(), &channel_name, &header, &mut w)?;"}],"del_contents":[{"Del":" let h = libpijul::tag::from_channel(&txn, &channel_name, &header, &mut w)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":101,"ins":{"up_context":[{"change":9,"pos":3358}],"down_context":[{"change":9,"pos":3432}],"flag":"BLOCK","start":3026,"end":3128,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3358},"to":{"change":9,"start":3358,"end":3432},"introduced_by":9}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" txn.write()"},{"Add":" .put_tags(&mut *channel.write(), last_t.into(), &h)?;"}],"del_contents":[{"Del":" txn.put_tags(&mut *channel.write()?, last_t.into(), &h)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":148,"ins":{"up_context":[{"change":9,"pos":849}],"down_context":[{"change":9,"pos":930}],"flag":"BLOCK","start":3129,"end":3209,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":849},"to":{"change":9,"start":849,"end":930},"introduced_by":9}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" for t in txn.rev_iter_tags(txn.tags(&*channel.read()), None)? {"}],"del_contents":[{"Del":" for t in txn.rev_iter_tags(txn.tags(&*channel.read()?), None)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":212,"ins":{"up_context":[{"change":6,"pos":744}],"down_context":[{"change":6,"pos":769}],"flag":"BLOCK","start":3210,"end":3230,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":744},"to":{"change":6,"start":744,"end":769},"introduced_by":6}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":215,"ins":{"up_context":[{"change":6,"pos":821}],"down_context":[{"change":6,"pos":907}],"flag":"BLOCK","start":3231,"end":3308,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":821},"to":{"change":6,"start":821,"end":907},"introduced_by":6}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.read().load_channel(channel)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.read().unwrap().load_channel(channel)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":74},"path":"pijul/src/commands/tag.rs","line":225,"ins":{"up_context":[{"change":6,"pos":1071}],"down_context":[{"change":6,"pos":1106}],"flag":"BLOCK","start":3309,"end":3337,"inode":{"change":9,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1071},"to":{"change":6,"start":1071,"end":1106},"introduced_by":6}],"inode":{"change":9,"pos":74}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Edit":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1313},"to":{"change":9,"start":6259,"end":6289},"introduced_by":9}],"inode":{"change":9,"pos":97650}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":41,"ins":{"up_context":[{"change":9,"pos":13910}],"down_context":[{"change":9,"pos":6481}],"flag":"BLOCK","start":3338,"end":3388,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":13910},"to":{"change":9,"start":6431,"end":6481},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":6431},"to":{"change":9,"start":6431,"end":6481},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"}],"del_contents":[{"Del":" let txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":43,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":6482}],"down_context":[{"change":9,"pos":770}],"flag":"BLOCK","start":3389,"end":3535,"inode":{"change":9,"pos":97650}}},"contents":[{"Add":" let cur = txn"},{"Add":" .read()"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":51,"ins":{"up_context":[{"change":9,"pos":864}],"down_context":[{"change":9,"pos":932}],"flag":"BLOCK","start":3536,"end":3561,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":864},"to":{"change":9,"start":864,"end":932},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" cur.as_str()"}],"del_contents":[{"Del":" txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":54,"ins":{"up_context":[{"change":9,"pos":108}],"down_context":[{"change":9,"pos":98538}],"flag":"BLOCK","start":3562,"end":3649,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":108},"to":{"change":9,"start":6652,"end":6732},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.read().load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(&channel_name)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":69,"ins":{"up_context":[{"change":9,"pos":150}],"down_context":[{"change":9,"pos":99241}],"flag":"BLOCK","start":3650,"end":3750,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":150},"to":{"change":9,"start":99169,"end":99241},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":186},"to":{"change":9,"start":99169,"end":99241},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":99169},"to":{"change":9,"start":99169,"end":99241},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" txn.read()"},{"Add":" .follow_oldest_path(&repo.changes, &channel, &path)?"}],"del_contents":[{"Del":" txn.follow_oldest_path(&repo.changes, &channel, &path)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":78,"ins":{"up_context":[{"change":9,"pos":301}],"down_context":[{"change":9,"pos":99394}],"flag":"BLOCK","start":3751,"end":3851,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":174},"to":{"change":9,"start":99322,"end":99394},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":264},"to":{"change":9,"start":99322,"end":99394},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":301},"to":{"change":9,"start":99322,"end":99394},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":99322},"to":{"change":9,"start":99322,"end":99394},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" txn.read()"},{"Add":" .follow_oldest_path(&repo.changes, &channel, &path)?"}],"del_contents":[{"Del":" txn.follow_oldest_path(&repo.changes, &channel, &path)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":83,"ins":{"up_context":[{"change":9,"pos":99469}],"down_context":[{"change":9,"pos":99495}],"flag":"BLOCK","start":3852,"end":3915,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":99469},"to":{"change":9,"start":6779,"end":6843},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &*txn.read(),"},{"Add":" &channel.read(),"}],"del_contents":[{"Del":" &txn,\n &channel.read().unwrap(),\n"}]}},{"Edit":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":91,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":6882},"to":{"change":9,"start":6882,"end":6928},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":6928},"to":{"change":9,"start":6928,"end":6929},"introduced_by":9}],"inode":{"change":9,"pos":97650}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":93,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":998},"to":{"change":9,"start":998,"end":1020},"introduced_by":9}],"inode":{"change":9,"pos":97650}}},"contents":[{"Del":" .unwrap()\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":105,"ins":{"up_context":[{"change":9,"pos":7359}],"down_context":[{"change":9,"pos":1188}],"flag":"BLOCK","start":3916,"end":3954,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7359},"to":{"change":9,"start":7359,"end":7406},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":114,"ins":{"up_context":[{"change":9,"pos":7733}],"down_context":[{"change":9,"pos":7780}],"flag":"BLOCK","start":3955,"end":3995,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7733},"to":{"change":9,"start":7733,"end":7780},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":130,"ins":{"up_context":[{"change":9,"pos":1334}],"down_context":[{"change":9,"pos":8400}],"flag":"BLOCK","start":3996,"end":4079,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":1334},"to":{"change":9,"start":8307,"end":8400},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8307},"to":{"change":9,"start":8307,"end":8400},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" let last_modified = last_modified(&*txn.read(), &*channel.read());"}],"del_contents":[{"Del":" let last_modified = last_modified(&*txn.read().unwrap(), &*channel.read()?);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":132,"ins":{"up_context":[{"change":9,"pos":8464}],"down_context":[{"change":9,"pos":8511}],"flag":"BLOCK","start":4080,"end":4120,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8464},"to":{"change":9,"start":8464,"end":8511},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":134,"ins":{"up_context":[{"change":9,"pos":8546}],"down_context":[{"change":9,"pos":8616}],"flag":"BLOCK","start":4121,"end":4177,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8546},"to":{"change":9,"start":8546,"end":8616},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":142,"ins":{"up_context":[{"change":9,"pos":8764}],"down_context":[{"change":9,"pos":9024}],"flag":"BLOCK","start":4178,"end":4250,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8764},"to":{"change":9,"start":8764,"end":9024},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" txn.write().touch_channel(&mut *channel.write(), None);"}],"del_contents":[{"Del":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n txn.touch_channel(&mut *channel.write()?, None);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":147,"ins":{"up_context":[{"change":9,"pos":9145}],"down_context":[{"change":9,"pos":1384}],"flag":"BLOCK","start":4251,"end":4291,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":9145},"to":{"change":9,"start":1335,"end":1384},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" let mut txn_ = txn.write();"}],"del_contents":[{"Del":" let mut txn_ = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":150,"ins":{"up_context":[{"change":9,"pos":9311}],"down_context":[{"change":3,"pos":0}],"flag":"BLOCK","start":4292,"end":4424,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":9311},"to":{"change":9,"start":9311,"end":9504},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" let (a, b, s) ="},{"Add":" libpijul::pristine::last_common_state(&*txn_, &*cur.read(), &*channel.read())?;"}],"del_contents":[{"Del":" let (a, b, s) = libpijul::pristine::last_common_state(\n &*txn_,\n &*cur.read()?,\n &*channel.read()?,\n )?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":159,"ins":{"up_context":[{"change":3,"pos":233}],"down_context":[{"change":9,"pos":9737}],"flag":"BLOCK","start":4425,"end":4603,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":233},"to":{"change":9,"start":9557,"end":9737},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":9557},"to":{"change":9,"start":9557,"end":9737},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" changes_after(&*txn_, &*cur.read(), a, &mut changediff, &mut inodes)?;"},{"Add":" changes_after(&*txn_, &*channel.read(), b, &mut changediff, &mut inodes)?;"}],"del_contents":[{"Del":" changes_after(&*txn_, &*cur.read()?, a, &mut changediff, &mut inodes)?;\n changes_after(&*txn_, &*channel.read()?, b, &mut changediff, &mut inodes)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":169,"ins":{"up_context":[{"change":9,"pos":10047}],"down_context":[{"change":9,"pos":10147}],"flag":"BLOCK","start":4604,"end":4703,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":10047},"to":{"change":9,"start":10047,"end":10147},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read(), false, *pos)?"}],"del_contents":[{"Del":" libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read()?, false, *pos)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":188,"ins":{"up_context":[{"change":9,"pos":10723}],"down_context":[{"change":9,"pos":10770}],"flag":"BLOCK","start":4704,"end":4744,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":10723},"to":{"change":9,"start":10723,"end":10770},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":190,"ins":{"up_context":[{"change":9,"pos":10805}],"down_context":[{"change":9,"pos":10875}],"flag":"BLOCK","start":4745,"end":4801,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":10805},"to":{"change":9,"start":10805,"end":10875},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":201,"ins":{"up_context":[{"change":9,"pos":11123}],"down_context":[{"change":9,"pos":11162}],"flag":"BLOCK","start":4802,"end":4842,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":11123},"to":{"change":9,"start":11123,"end":11162},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":203,"ins":{"up_context":[{"change":9,"pos":11197}],"down_context":[{"change":9,"pos":11259}],"flag":"BLOCK","start":4843,"end":4899,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":11197},"to":{"change":9,"start":11197,"end":11259},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":227,"ins":{"up_context":[{"change":9,"pos":11929}],"down_context":[{"change":9,"pos":11976}],"flag":"BLOCK","start":4900,"end":4940,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":11929},"to":{"change":9,"start":11929,"end":11976},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":229,"ins":{"up_context":[{"change":9,"pos":12011}],"down_context":[{"change":9,"pos":12081}],"flag":"BLOCK","start":4941,"end":4997,"inode":{"change":9,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":12011},"to":{"change":9,"start":12011,"end":12081},"introduced_by":9}],"inode":{"change":9,"pos":97650}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Edit":{"inode":{"change":9,"pos":97650},"path":"pijul/src/commands/reset.rs","line":240,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":101723},"to":{"change":9,"start":12248,"end":12399},"introduced_by":9}],"inode":{"change":9,"pos":97650}}},"contents":[{"Del":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":3,"ins":{"up_context":[{"change":9,"pos":24}],"down_context":[{"change":9,"pos":1485}],"flag":"BLOCK","start":4998,"end":5018,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":24},"to":{"change":9,"start":12484,"end":12514},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":12,"ins":{"up_context":[{"change":9,"pos":12531}],"down_context":[{"change":9,"pos":12620}],"flag":"BLOCK","start":5019,"end":5107,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":12531},"to":{"change":9,"start":12531,"end":12620},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" ArcTxn, Base32, ChannelMutTxnT, ChannelRef, ChannelTxnT, MutTxnTExt, TxnT, TxnTExt,"}],"del_contents":[{"Del":" Base32, ChannelMutTxnT, ChannelRef, ChannelTxnT, MutTxnT, MutTxnTExt, TxnT, TxnTExt,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":70,"ins":{"up_context":[{"change":9,"pos":103545}],"down_context":[{"change":9,"pos":1549}],"flag":"BLOCK","start":5108,"end":5304,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":103545},"to":{"change":9,"start":229,"end":283},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let cur = txn"},{"Add":" .read()"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":79,"ins":{"up_context":[{"change":9,"pos":1638}],"down_context":[{"change":9,"pos":1706}],"flag":"BLOCK","start":5305,"end":5330,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1638},"to":{"change":9,"start":1638,"end":1706},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" cur.as_str()"}],"del_contents":[{"Del":" txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":81,"ins":{"up_context":[{"change":9,"pos":1717}],"down_context":[{"change":9,"pos":160}],"flag":"BLOCK","start":5331,"end":5417,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":1717},"to":{"change":9,"start":82,"end":160},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":82},"to":{"change":9,"start":82,"end":160},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" let mut channel = if let Some(channel) = txn.read().load_channel(&channel)? {"}],"del_contents":[{"Del":" let mut channel = if let Some(channel) = txn.load_channel(channel)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":89,"ins":{"up_context":[{"change":9,"pos":287}],"down_context":[{"change":9,"pos":338}],"flag":"BLOCK","start":5418,"end":5476,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":287},"to":{"change":9,"start":287,"end":338},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" let (h, c) = txn.read().hash_from_prefix(h)?;"}],"del_contents":[{"Del":" let (h, c) = txn.hash_from_prefix(h)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":91,"ins":{"up_context":[{"change":9,"pos":357}],"down_context":[{"change":9,"pos":424}],"flag":"BLOCK","start":5477,"end":5575,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":357},"to":{"change":9,"start":12732,"end":12800},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" .read()"},{"Add":" .get_changeset(txn.read().changes(&*channel.read()), &c)?"}],"del_contents":[{"Del":" .get_changeset(txn.changes(&*channel.read()?), &c)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":98,"ins":{"up_context":[{"change":9,"pos":590}],"down_context":[{"change":9,"pos":632}],"flag":"BLOCK","start":5576,"end":5616,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":590},"to":{"change":9,"start":12801,"end":12850},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" channel.read().name"}],"del_contents":[{"Del":" channel.read().unwrap().name\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":106,"ins":{"up_context":[{"change":9,"pos":128}],"down_context":[{"change":9,"pos":10134}],"flag":"BLOCK","start":5617,"end":5763,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":128},"to":{"change":9,"start":128,"end":174},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":174},"to":{"change":9,"start":12851,"end":12938},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" txn.read().hash_from_prefix(hash)?.0"},{"Add":" } else if let Some(h) = txn.read().reverse_log(&*channel.read(), None)?.next() {"}],"del_contents":[{"Del":" txn.hash_from_prefix(hash)?.0\n"},{"Del":" } else if let Some(h) = txn.reverse_log(&*channel.read()?, None)?.next() {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":121,"ins":{"up_context":[{"change":9,"pos":282}],"down_context":[{"change":9,"pos":368}],"flag":"BLOCK","start":5764,"end":5798,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":282},"to":{"change":9,"start":342,"end":368},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" txn.write().unrecord("}],"del_contents":[{"Del":" txn.unrecord(\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":136,"ins":{"up_context":[{"change":9,"pos":506}],"down_context":[{"change":9,"pos":590}],"flag":"BLOCK","start":5799,"end":5883,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":506},"to":{"change":9,"start":13021,"end":13154},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" Some(libpijul::working_copy::filesystem::FileSystem::from_root(w)),"}],"del_contents":[{"Del":" Some(Arc::new(\n libpijul::working_copy::filesystem::FileSystem::from_root(w),\n )),\n"}]}},{"Edit":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":141,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":696},"to":{"change":9,"start":13155,"end":13201},"introduced_by":9}],"inode":{"change":9,"pos":101759}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":147,"ins":{"up_context":[{"change":9,"pos":13231}],"down_context":[{"change":9,"pos":104172}],"flag":"BLOCK","start":5884,"end":5949,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":13231},"to":{"change":9,"start":13231,"end":13302},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" working_copy.as_ref().unwrap_or(&repo.working_copy),"}],"del_contents":[{"Del":" working_copy.clone().unwrap_or(repo.working_copy.clone()),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":159,"ins":{"up_context":[{"change":9,"pos":2058}],"down_context":[{"change":9,"pos":14018}],"flag":"BLOCK","start":5950,"end":6076,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":2058},"to":{"change":9,"start":1145,"end":1421},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":105101},"to":{"change":9,"start":1145,"end":1421},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" let mut txn_ = txn.write();"},{"Add":" txn_.apply_local_change(&mut channel, &change, &hash, &updates)?;"}],"del_contents":[{"Del":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n txn.apply_local_change(&mut channel, &change, &hash, &updates)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":184,"ins":{"up_context":[{"change":9,"pos":2172}],"down_context":[{"change":9,"pos":681}],"flag":"BLOCK","start":6077,"end":6154,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2172},"to":{"change":9,"start":2172,"end":2249},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" txn_.touch_channel(&mut *channel.write(), Some(oldest));"}],"del_contents":[{"Del":" txn.touch_channel(&mut *channel.write()?, Some(oldest));\n"}]}},{"Edit":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":186,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":699}],"down_context":[{"change":9,"pos":2250}],"flag":"BLOCK","start":6155,"end":6193,"inode":{"change":9,"pos":101759}}},"contents":[{"Add":" std::mem::drop(txn_);"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":191,"ins":{"up_context":[{"change":9,"pos":2360}],"down_context":[{"change":9,"pos":2644}],"flag":"BLOCK","start":6194,"end":6270,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2360},"to":{"change":9,"start":2360,"end":2644},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" txn.write().touch_channel(&mut *channel.write(), None);"}],"del_contents":[{"Del":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n txn.touch_channel(&mut *channel.write()?, None);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":270,"ins":{"up_context":[{"change":9,"pos":106516}],"down_context":[{"change":9,"pos":13785}],"flag":"BLOCK","start":6271,"end":6295,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":106516},"to":{"change":9,"start":13756,"end":13785},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":272,"ins":{"up_context":[{"change":9,"pos":13817}],"down_context":[{"change":9,"pos":106637}],"flag":"BLOCK","start":6296,"end":6355,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":13817},"to":{"change":9,"start":13817,"end":13880},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" working_copy: &libpijul::working_copy::FileSystem,"}],"del_contents":[{"Del":" working_copy: Arc,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":280,"ins":{"up_context":[{"change":9,"pos":572}],"down_context":[{"change":9,"pos":604}],"flag":"BLOCK","start":6356,"end":6383,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":572},"to":{"change":9,"start":572,"end":604},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" ArcTxn,"}],"del_contents":[{"Del":" Arc>,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":286,"ins":{"up_context":[{"change":9,"pos":777}],"down_context":[{"change":9,"pos":778}],"flag":"BLOCK","start":6384,"end":6407,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":777},"to":{"change":9,"start":13881,"end":13909},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":2771},"to":{"change":9,"start":13881,"end":13909},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":106748},"to":{"change":9,"start":13881,"end":13909},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" ArcTxn,"}],"del_contents":[{"Del":" Arc>,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":305,"ins":{"up_context":[{"change":9,"pos":14035}],"down_context":[{"change":9,"pos":1408}],"flag":"BLOCK","start":6408,"end":6450,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":14035},"to":{"change":9,"start":14035,"end":14085},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" working_copy,"}],"del_contents":[{"Del":" working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":317,"ins":{"up_context":[{"change":9,"pos":14233}],"down_context":[{"change":9,"pos":1757}],"flag":"BLOCK","start":6451,"end":6485,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":14233},"to":{"change":9,"start":14233,"end":14275},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" working_copy,"}],"del_contents":[{"Del":" working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":342,"ins":{"up_context":[{"change":9,"pos":14659}],"down_context":[{"change":9,"pos":107617}],"flag":"BLOCK","start":6486,"end":6518,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":14659},"to":{"change":9,"start":14659,"end":14700},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" let txn_ = txn.write();"}],"del_contents":[{"Del":" let txn_ = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":101759},"path":"pijul/src/commands/record.rs","line":349,"ins":{"up_context":[{"change":9,"pos":14827}],"down_context":[{"change":9,"pos":14863}],"flag":"BLOCK","start":6519,"end":6546,"inode":{"change":9,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":14827},"to":{"change":9,"start":14827,"end":14863},"introduced_by":9}],"inode":{"change":9,"pos":101759}},"ins_contents":[{"Add":" c.into_inner()"}],"del_contents":[{"Del":" c.into_inner().unwrap()\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1695},"to":{"change":9,"start":15142,"end":15172},"introduced_by":9}],"inode":{"change":9,"pos":111631}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":43,"ins":{"up_context":[{"change":9,"pos":12956}],"down_context":[{"change":9,"pos":112628}],"flag":"BLOCK","start":6547,"end":6630,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":12956},"to":{"change":9,"start":14737,"end":14829},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" writeln!(stdout, \" {}: {}\", r.id(), r.lock().path.as_str())?;"}],"del_contents":[{"Del":" writeln!(stdout, \" {}: {}\", r.id(), r.lock().unwrap().path.as_str())?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":131,"ins":{"up_context":[{"change":9,"pos":114607}],"down_context":[{"change":9,"pos":1772}],"flag":"BLOCK","start":6631,"end":6827,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":114607},"to":{"change":9,"start":1718,"end":1772},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let cur = txn"},{"Add":" .read()"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":140,"ins":{"up_context":[{"change":9,"pos":1871}],"down_context":[{"change":9,"pos":114690}],"flag":"BLOCK","start":6828,"end":6864,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1871},"to":{"change":9,"start":1871,"end":1971},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" cur.as_str()"},{"Add":" };"}],"del_contents":[{"Del":" txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)\n }\n .to_string();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":155,"ins":{"up_context":[{"change":9,"pos":115226}],"down_context":[{"change":9,"pos":115255}],"flag":"BLOCK","start":6865,"end":6894,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":115226},"to":{"change":9,"start":1972,"end":2010},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" channel_name"}],"del_contents":[{"Del":" channel_name.as_str()\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":160,"ins":{"up_context":[{"change":9,"pos":115325}],"down_context":[{"change":9,"pos":115350}],"flag":"BLOCK","start":6895,"end":6920,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":115325},"to":{"change":9,"start":2011,"end":2045},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" channel_name"}],"del_contents":[{"Del":" channel_name.as_str()\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":172,"ins":{"up_context":[{"change":9,"pos":115558}],"down_context":[{"change":9,"pos":115888}],"flag":"BLOCK","start":6921,"end":7114,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":401},"to":{"change":9,"start":6954,"end":7038},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":115611},"to":{"change":9,"start":6954,"end":7038},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7038},"to":{"change":9,"start":2046,"end":2112},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let remote_changes = remote"},{"Add":" .update_changelist(&mut *txn.write(), &self.path)"},{"Add":" .await?;"},{"Add":" let channel = txn.write().open_or_create_channel(&channel_name)?;"}],"del_contents":[{"Del":" let remote_changes = remote.update_changelist(&mut txn, &self.path).await?;\n"},{"Del":" let channel = txn.open_or_create_channel(&channel_name)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":179,"ins":{"up_context":[{"change":9,"pos":7118}],"down_context":[{"change":9,"pos":116032}],"flag":"BLOCK","start":7115,"end":7245,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7118},"to":{"change":9,"start":7118,"end":7207},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let (p, ambiguous) = txn"},{"Add":" .read()"},{"Add":" .follow_oldest_path(&repo.changes, &channel, path)?;"}],"del_contents":[{"Del":" let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, path)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":187,"ins":{"up_context":[{"change":9,"pos":12983}],"down_context":[{"change":9,"pos":13071}],"flag":"BLOCK","start":7246,"end":7340,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":12983},"to":{"change":9,"start":15173,"end":15260},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" libpijul::fs::iter_graph_descendants(&*txn.read(), &channel.read().graph, p)?"}],"del_contents":[{"Del":" libpijul::fs::iter_graph_descendants(&txn, &channel.read()?.graph, p)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":193,"ins":{"up_context":[{"change":9,"pos":10513}],"down_context":[{"change":9,"pos":116707}],"flag":"BLOCK","start":7341,"end":7657,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":10513},"to":{"change":9,"start":15261,"end":15322},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":15322},"to":{"change":9,"start":13190,"end":13224},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":13190},"to":{"change":9,"start":13190,"end":13224},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":13224},"to":{"change":9,"start":7456,"end":7524},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":116338},"to":{"change":9,"start":7456,"end":7524},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7524},"to":{"change":9,"start":10514,"end":10577},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":10577},"to":{"change":9,"start":4622,"end":4667},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":13287},"to":{"change":9,"start":4622,"end":4667},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4622},"to":{"change":9,"start":4622,"end":4667},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4667},"to":{"change":9,"start":13288,"end":13347},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":13347},"to":{"change":9,"start":10578,"end":10644},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":10644},"to":{"change":9,"start":7525,"end":7567},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":13412},"to":{"change":9,"start":7525,"end":7567},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4789},"to":{"change":9,"start":7525,"end":7567},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7567},"to":{"change":9,"start":10645,"end":10694},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":10694},"to":{"change":9,"start":7609,"end":7686},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7609},"to":{"change":9,"start":7609,"end":7686},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7686},"to":{"change":9,"start":10695,"end":10835},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":10835},"to":{"change":9,"start":7819,"end":7888},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7819},"to":{"change":9,"start":7819,"end":7888},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":7888},"to":{"change":9,"start":4961,"end":4987},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4961},"to":{"change":9,"start":4961,"end":4987},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" {"},{"Add":" let txn = txn.read();"},{"Add":" for x in txn.reverse_log(&*channel.read(), None)? {"},{"Add":" let (_, (h, m)) = x?;"},{"Add":" if let Some((_, ref remote_changes)) = remote_changes {"},{"Add":" if txn.remote_has_state(remote_changes, &m)? {"},{"Add":" break;"}],"del_contents":[{"Del":" for x in txn.reverse_log(&*channel.read()?, None)? {\n"},{"Del":" let (_, (h, m)) = x?;\n"},{"Del":" if let Some((_, ref remote_changes)) = remote_changes {\n"},{"Del":" if txn.remote_has_state(remote_changes, &m)? {\n"},{"Del":" break;\n }\n"},{"Del":" let h_int = txn.get_internal(h)?.unwrap();\n"},{"Del":" if !txn.remote_has_change(&remote_changes, &h)? {\n"},{"Del":" if paths.is_empty() {\n"},{"Del":" to_upload.push(h.into())\n"},{"Del":" } else {\n for p in paths.iter() {\n"},{"Del":" if txn.get_touched_files(p, Some(h_int))?.is_some() {\n to_upload.push(h.into());\n"},{"Del":" break;\n }\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":201,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":116729},"to":{"change":9,"start":5017,"end":5132},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":5132},"to":{"change":9,"start":13497,"end":13572},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":13572},"to":{"change":9,"start":15323,"end":15374},"introduced_by":9}],"inode":{"change":9,"pos":111631}}},"contents":[{"Del":" }\n } else if let crate::remote::RemoteRepo::LocalChannel(ref remote_channel) = remote {\n"},{"Del":" if let Some(channel) = txn.load_channel(remote_channel)? {\n"},{"Del":" let channel = channel.read()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":202,"ins":{"up_context":[{"change":9,"pos":13636}],"down_context":[{"change":9,"pos":7889}],"flag":"BLOCK","start":7658,"end":7728,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":13636},"to":{"change":9,"start":344,"end":428},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" if !txn.remote_has_change(&remote_changes, &h)? {"}],"del_contents":[{"Del":" if txn.get_changeset(txn.changes(&channel), h_int)?.is_none() {\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":214,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":5745}],"down_context":[{"change":9,"pos":116792}],"flag":"BLOCK","start":7729,"end":8671,"inode":{"change":9,"pos":111631}}},"contents":[{"Add":" } else if let crate::remote::RemoteRepo::LocalChannel(ref remote_channel) = remote {"},{"Add":" if let Some(channel) = txn.load_channel(remote_channel)? {"},{"Add":" let channel = channel.read();"},{"Add":" let h_int = txn.get_internal(h)?.unwrap();"},{"Add":" if txn.get_changeset(txn.changes(&channel), h_int)?.is_none() {"},{"Add":" if paths.is_empty() {"},{"Add":" to_upload.push(h.into())"},{"Add":" } else {"},{"Add":" for p in paths.iter() {"},{"Add":" if txn.get_touched_files(p, Some(h_int))?.is_some() {"},{"Add":" to_upload.push(h.into());"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":246,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":506}],"down_context":[{"change":9,"pos":506}],"flag":"BLOCK","start":8672,"end":8706,"inode":{"change":9,"pos":111631}}},"contents":[{"Add":" let txn = txn.read();"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":273,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":8408}],"down_context":[{"change":9,"pos":69}],"flag":"BLOCK","start":8707,"end":8741,"inode":{"change":9,"pos":111631}}},"contents":[{"Add":" let txn = txn.read();"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":276,"ins":{"up_context":[{"change":9,"pos":158}],"down_context":[{"change":9,"pos":232}],"flag":"BLOCK","start":8742,"end":8840,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":158},"to":{"change":9,"start":0,"end":97},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let comp = complete_deps(&*txn, &remote_changes, &repo.changes, &to_upload, &d)?;"}],"del_contents":[{"Del":" let comp = complete_deps(&txn, &remote_changes, &repo.changes, &to_upload, &d)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":292,"ins":{"up_context":[{"change":9,"pos":117334}],"down_context":[{"change":9,"pos":117414}],"flag":"BLOCK","start":8841,"end":9019,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":117334},"to":{"change":9,"start":2417,"end":2507},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" .upload_changes("},{"Add":" &mut *txn.write(),"},{"Add":" repo.changes_dir.clone(),"},{"Add":" push_channel,"},{"Add":" &to_upload,"},{"Add":" )"}],"del_contents":[{"Del":" .upload_changes(&mut txn, repo.changes_dir.clone(), push_channel, &to_upload)\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":309,"ins":{"up_context":[{"change":9,"pos":15372}],"down_context":[{"change":7,"pos":0}],"flag":"BLOCK","start":9020,"end":9216,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":15372},"to":{"change":9,"start":402,"end":456},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":6765},"to":{"change":9,"start":402,"end":456},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":456},"to":{"change":9,"start":2113,"end":2188},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let cur = txn"},{"Add":" .read()"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"},{"Del":" let cur = txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":318,"ins":{"up_context":[{"change":9,"pos":2287}],"down_context":[{"change":9,"pos":2335}],"flag":"BLOCK","start":9217,"end":9253,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2287},"to":{"change":9,"start":2287,"end":2335},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" cur.as_str()"},{"Add":" };"}],"del_contents":[{"Del":" cur\n }\n .to_string();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":321,"ins":{"up_context":[{"change":9,"pos":2389}],"down_context":[{"change":9,"pos":117853}],"flag":"BLOCK","start":9254,"end":9332,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2389},"to":{"change":9,"start":2389,"end":2459},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let mut channel = txn.write().open_or_create_channel(&channel_name)?;"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(&channel_name)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":347,"ins":{"up_context":[{"change":9,"pos":8542}],"down_context":[{"change":9,"pos":8542}],"flag":"BLOCK","start":9333,"end":9452,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8542},"to":{"change":9,"start":15396,"end":15480},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let remote_changes = remote"},{"Add":" .update_changelist(&mut *txn.write(), &self.path)"},{"Add":" .await?;"}],"del_contents":[{"Del":" let remote_changes = remote.update_changelist(&mut txn, &self.path).await?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":355,"ins":{"up_context":[{"change":9,"pos":8812}],"down_context":[{"change":9,"pos":11155}],"flag":"BLOCK","start":9453,"end":9569,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":8812},"to":{"change":9,"start":15375,"end":15454},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" for x in txn.iter_remote(&remote_changes.lock().remote, 0)? {"}],"del_contents":[{"Del":" for x in txn.iter_remote(&remote_changes.lock()?.remote, 0)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":359,"ins":{"up_context":[{"change":9,"pos":27}],"down_context":[{"change":9,"pos":105}],"flag":"BLOCK","start":9570,"end":9650,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":27},"to":{"change":9,"start":15455,"end":15536},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" .channel_has_state(txn.states(&*channel.read()), &p.b)?"}],"del_contents":[{"Del":" .channel_has_state(txn.states(&*channel.read()?), &p.b)?\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":369,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":8863}],"down_context":[{"change":9,"pos":8863}],"flag":"BLOCK","start":9651,"end":9689,"inode":{"change":9,"pos":111631}}},"contents":[{"Add":" let txn = txn.read();"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":377,"ins":{"up_context":[{"change":9,"pos":14103}],"down_context":[{"change":9,"pos":14199}],"flag":"BLOCK","start":9690,"end":9785,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":14103},"to":{"change":9,"start":15537,"end":15632},"introduced_by":9}],"inode":{"change":9,"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.read()?.graph, p)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":386,"ins":{"up_context":[{"change":9,"pos":14430}],"down_context":[{"change":9,"pos":14431}],"flag":"BLOCK","start":9786,"end":9850,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":14430},"to":{"change":9,"start":15633,"end":15698},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let remote_channel = remote_channel.read();"}],"del_contents":[{"Del":" let remote_channel = remote_channel.read()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":390,"ins":{"up_context":[{"change":9,"pos":194}],"down_context":[{"change":9,"pos":276}],"flag":"BLOCK","start":9851,"end":9933,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":194},"to":{"change":9,"start":15699,"end":15782},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" .channel_has_state(txn.states(&*channel.read()), &m)?"}],"del_contents":[{"Del":" .channel_has_state(txn.states(&*channel.read()?), &m)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":397,"ins":{"up_context":[{"change":9,"pos":7561}],"down_context":[{"change":9,"pos":7644}],"flag":"BLOCK","start":9934,"end":10016,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":7561},"to":{"change":9,"start":15783,"end":15866},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" .get_changeset(txn.changes(&*channel.read()), h_int)?"}],"del_contents":[{"Del":" .get_changeset(txn.changes(&*channel.read()?), h_int)?\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":419,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":119192}],"down_context":[{"change":9,"pos":2508}],"flag":"BLOCK","start":10017,"end":10051,"inode":{"change":9,"pos":111631}}},"contents":[{"Add":" let txn = txn.read();"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":428,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":9828},"to":{"change":9,"start":15867,"end":15913},"introduced_by":9}],"inode":{"change":9,"pos":111631}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":429,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":15987},"to":{"change":9,"start":15987,"end":16142},"introduced_by":9}],"inode":{"change":9,"pos":111631}}},"contents":[{"Del":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":432,"ins":{"up_context":[{"change":9,"pos":9978}],"down_context":[{"change":9,"pos":10004}],"flag":"BLOCK","start":10052,"end":10087,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":9978},"to":{"change":9,"start":9978,"end":10004},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" &mut *txn.write(),"}],"del_contents":[{"Del":" &mut txn,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":454,"ins":{"up_context":[{"change":9,"pos":566}],"down_context":[{"change":9,"pos":642}],"flag":"BLOCK","start":10088,"end":10185,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":566},"to":{"change":9,"start":98,"end":187},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let comp = complete_deps(&*txn.read(), &None, &repo.changes, &to_download, &d)?;"}],"del_contents":[{"Del":" let comp = complete_deps(&txn, &None, &repo.changes, &to_download, &d)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":469,"ins":{"up_context":[{"change":9,"pos":267}],"down_context":[{"change":9,"pos":155}],"flag":"BLOCK","start":10186,"end":10272,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":267},"to":{"change":9,"start":509,"end":565},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" let mut channel = channel.write();"},{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":478,"ins":{"up_context":[{"change":9,"pos":120642}],"down_context":[{"change":9,"pos":120724}],"flag":"BLOCK","start":10273,"end":10363,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":120642},"to":{"change":9,"start":120642,"end":120724},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" .complete_changes(&repo, &*txn.read(), &mut channel, &to_download, self.full)"}],"del_contents":[{"Del":" .complete_changes(&repo, &txn, &mut channel, &to_download, self.full)\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":485,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":801}],"down_context":[{"change":9,"pos":801}],"flag":"BLOCK","start":10364,"end":10395,"inode":{"change":9,"pos":111631}}},"contents":[{"Add":" let txn_ = txn.read();"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":487,"ins":{"up_context":[{"change":9,"pos":839}],"down_context":[{"change":9,"pos":952}],"flag":"BLOCK","start":10396,"end":10518,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":839},"to":{"change":9,"start":11873,"end":11935},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":11935},"to":{"change":9,"start":894,"end":952},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":894},"to":{"change":9,"start":894,"end":952},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" if let Some(int) = txn_.get_internal(&d.into())? {"},{"Add":" for inode in txn_.iter_rev_touched(int)? {"}],"del_contents":[{"Del":" if let Some(int) = txn.get_internal(&d.into())? {\n"},{"Del":" for inode in txn.iter_rev_touched(int)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":496,"ins":{"up_context":[{"change":9,"pos":1227}],"down_context":[{"change":9,"pos":1301}],"flag":"BLOCK","start":10519,"end":10602,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1227},"to":{"change":9,"start":11936,"end":12018},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" change: txn_.get_external(&inode.change)?.unwrap().into(),"}],"del_contents":[{"Del":" change: txn.get_external(&inode.change)?.unwrap().into(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":505,"ins":{"up_context":[{"change":9,"pos":1543}],"down_context":[{"change":9,"pos":847}],"flag":"BLOCK","start":10603,"end":10633,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1543},"to":{"change":9,"start":16192,"end":16238},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" std::mem::drop(txn_);"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":508,"ins":{"up_context":[{"change":9,"pos":935}],"down_context":[{"change":9,"pos":1269}],"flag":"BLOCK","start":10634,"end":11075,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":935},"to":{"change":9,"start":935,"end":974},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":974},"to":{"change":9,"start":16239,"end":16493},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":16493},"to":{"change":9,"start":1129,"end":1269},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1129},"to":{"change":9,"start":1129,"end":1269},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" {"},{"Add":" let txn_ = txn.read();"},{"Add":" for &i in touched.iter() {"},{"Add":" if let Some((path, _)) ="},{"Add":" libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read(), false, i)?"},{"Add":" {"},{"Add":" touched_paths.push(path)"},{"Add":" } else {"},{"Add":" touched_paths.clear();"},{"Add":" break;"},{"Add":" }"}],"del_contents":[{"Del":" for &i in touched.iter() {\n"},{"Del":" if let Some((path, _)) = libpijul::fs::find_path(\n &repo.changes,\n &*txn.read().unwrap(),\n &*channel.read()?,\n false,\n i,\n )? {\n"},{"Del":" touched_paths.push(path)\n } else {\n touched_paths.clear();\n break;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":538,"ins":{"up_context":[{"change":9,"pos":16641}],"down_context":[{"change":9,"pos":16692}],"flag":"BLOCK","start":11076,"end":11120,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":16641},"to":{"change":9,"start":16641,"end":16692},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":540,"ins":{"up_context":[{"change":9,"pos":16731}],"down_context":[{"change":9,"pos":16809}],"flag":"BLOCK","start":11121,"end":11185,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":16731},"to":{"change":9,"start":16731,"end":16809},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":555,"ins":{"up_context":[{"change":9,"pos":17119}],"down_context":[{"change":9,"pos":17170}],"flag":"BLOCK","start":11186,"end":11230,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":17119},"to":{"change":9,"start":17119,"end":17170},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":557,"ins":{"up_context":[{"change":9,"pos":17209}],"down_context":[{"change":9,"pos":17287}],"flag":"BLOCK","start":11231,"end":11295,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":17209},"to":{"change":9,"start":17209,"end":17287},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Edit":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":570,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":11136},"to":{"change":9,"start":17493,"end":17648},"introduced_by":9}],"inode":{"change":9,"pos":111631}}},"contents":[{"Del":" let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}},{"Replacement":{"inode":{"change":9,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":571,"ins":{"up_context":[{"change":9,"pos":120988}],"down_context":[{"change":9,"pos":121048}],"flag":"BLOCK","start":11296,"end":11367,"inode":{"change":9,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":120988},"to":{"change":9,"start":731,"end":794},"introduced_by":9}],"inode":{"change":9,"pos":111631}},"ins_contents":[{"Add":" txn.write().unrecord(&repo.changes, &mut channel, &h, 0)?;"}],"del_contents":[{"Del":" txn.unrecord(&repo.changes, &mut channel, &h, 0)?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1913},"to":{"change":9,"start":17649,"end":17679},"introduced_by":9}],"inode":{"change":9,"pos":123281}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":53,"ins":{"up_context":[{"change":9,"pos":15837}],"down_context":[{"change":9,"pos":124930}],"flag":"BLOCK","start":11368,"end":11418,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":15837},"to":{"change":9,"start":457,"end":511},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":6929},"to":{"change":9,"start":457,"end":511},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":67,"ins":{"up_context":[{"change":9,"pos":15889}],"down_context":[{"change":9,"pos":15998}],"flag":"BLOCK","start":11419,"end":11527,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":15889},"to":{"change":9,"start":15889,"end":15998},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" let channel = load_channel(&*txn.read(), &cap[1])?;"},{"Add":" let c = channel.read();"}],"del_contents":[{"Del":" let channel = load_channel(&txn, &cap[1])?;\n let c = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":72,"ins":{"up_context":[{"change":9,"pos":16129}],"down_context":[{"change":9,"pos":125525}],"flag":"BLOCK","start":11528,"end":11596,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":16129},"to":{"change":9,"start":125465,"end":125525},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":125465},"to":{"change":9,"start":125465,"end":125525},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" let channel = load_channel(&*txn.read(), &cap[1])?;"}],"del_contents":[{"Del":" let channel = load_channel(&txn, &cap[1])?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":79,"ins":{"up_context":[{"change":9,"pos":125737}],"down_context":[{"change":9,"pos":15402}],"flag":"BLOCK","start":11597,"end":11667,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":125737},"to":{"change":9,"start":17680,"end":17744},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" for x in txn.read().log(&*channel.read(), pos)? {"}],"del_contents":[{"Del":" for x in txn.log(&*channel.read()?, pos)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":94,"ins":{"up_context":[{"change":9,"pos":126196}],"down_context":[{"change":9,"pos":15540}],"flag":"BLOCK","start":11668,"end":11765,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":126196},"to":{"change":9,"start":17745,"end":17836},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" } else if let Some(x) = txn.read().reverse_log(&*channel.read(), None)?.next() {"}],"del_contents":[{"Del":" } else if let Some(x) = txn.reverse_log(&*channel.read()?, None)?.next() {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":103,"ins":{"up_context":[{"change":9,"pos":126588}],"down_context":[{"change":9,"pos":126648}],"flag":"BLOCK","start":11766,"end":11834,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":126588},"to":{"change":9,"start":126588,"end":126648},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" let channel = load_channel(&*txn.read(), &cap[1])?;"}],"del_contents":[{"Del":" let channel = load_channel(&txn, &cap[1])?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":107,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":11419}],"down_context":[{"change":9,"pos":126749}],"flag":"BLOCK","start":11835,"end":11873,"inode":{"change":9,"pos":123281}}},"contents":[{"Add":" let txn = txn.read();"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":119,"ins":{"up_context":[{"change":9,"pos":15745}],"down_context":[{"change":9,"pos":15845}],"flag":"BLOCK","start":11874,"end":11973,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":15745},"to":{"change":9,"start":17837,"end":17936},"introduced_by":9}],"inode":{"change":9,"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.read()?.graph, p)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":128,"ins":{"up_context":[{"change":9,"pos":11929}],"down_context":[{"change":9,"pos":16097}],"flag":"BLOCK","start":11974,"end":12034,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":11929},"to":{"change":9,"start":17937,"end":17998},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" for x in txn.log(&*channel.read(), from)? {"}],"del_contents":[{"Del":" for x in txn.log(&*channel.read()?, from)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":191,"ins":{"up_context":[{"change":9,"pos":130373}],"down_context":[{"change":9,"pos":626}],"flag":"BLOCK","start":12035,"end":12103,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":130373},"to":{"change":9,"start":566,"end":626},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" let channel = load_channel(&*txn.read(), &cap[1])?;"}],"del_contents":[{"Del":" let channel = load_channel(&txn, &cap[1])?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":193,"ins":{"up_context":[{"change":9,"pos":644}],"down_context":[{"change":9,"pos":794}],"flag":"BLOCK","start":12104,"end":12278,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":644},"to":{"change":9,"start":644,"end":794},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" let mut channel_ = channel.write();"},{"Add":" txn.write()"},{"Add":" .apply_change_ws(&repo.changes, &mut channel_, &h, &mut ws)?;"}],"del_contents":[{"Del":" let mut channel_ = channel.write().unwrap();\n txn.apply_change_ws(&repo.changes, &mut channel_, &h, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":205,"ins":{"up_context":[{"change":9,"pos":131201}],"down_context":[{"change":9,"pos":131261}],"flag":"BLOCK","start":12279,"end":12347,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":131201},"to":{"change":9,"start":131201,"end":131261},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" let channel = load_channel(&*txn.read(), &cap[1])?;"}],"del_contents":[{"Del":" let channel = load_channel(&txn, &cap[1])?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":212,"ins":{"up_context":[{"change":9,"pos":131779}],"down_context":[{"change":9,"pos":131952}],"flag":"BLOCK","start":12348,"end":12529,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":131779},"to":{"change":9,"start":17999,"end":18091},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":91},"to":{"change":9,"start":131876,"end":131952},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":16769},"to":{"change":9,"start":131876,"end":131952},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":18091},"to":{"change":9,"start":131876,"end":131952},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":131876},"to":{"change":9,"start":131876,"end":131952},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" if txn.read().current_state(&*channel.read())? == state && extra.is_empty() {"},{"Add":" txn.read().archive(&repo.changes, &channel, &mut tarball)?"}],"del_contents":[{"Del":" if txn.current_state(&*channel.read()?)? == state && extra.is_empty() {\n"},{"Del":" txn.archive(&repo.changes, &channel, &mut tarball)?\n"}]}},{"Edit":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":221,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":132242}],"down_context":[{"change":9,"pos":132242}],"flag":"BLOCK","start":12530,"end":12581,"inode":{"change":9,"pos":123281}}},"contents":[{"Add":" let mut txn = txn.write();"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":235,"ins":{"up_context":[{"change":9,"pos":132737}],"down_context":[{"change":9,"pos":132809}],"flag":"BLOCK","start":12582,"end":12662,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":132737},"to":{"change":9,"start":132737,"end":132809},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" txn.write().archive(&repo.changes, &channel, &mut tarball)?"}],"del_contents":[{"Del":" txn.archive(&repo.changes, &channel, &mut tarball)?\n"}]}},{"Edit":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":325,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":133262},"to":{"change":9,"start":18092,"end":18138},"introduced_by":9}],"inode":{"change":9,"pos":123281}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":327,"ins":{"up_context":[{"change":9,"pos":18236}],"down_context":[{"change":9,"pos":133390}],"flag":"BLOCK","start":12663,"end":12699,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":18236},"to":{"change":9,"start":18236,"end":18279},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":329,"ins":{"up_context":[{"change":9,"pos":133421}],"down_context":[{"change":9,"pos":133451}],"flag":"BLOCK","start":12700,"end":12748,"inode":{"change":9,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":133421},"to":{"change":9,"start":18280,"end":18342},"introduced_by":9}],"inode":{"change":9,"pos":123281}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Edit":{"inode":{"change":9,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":339,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":133549},"to":{"change":9,"start":18377,"end":18548},"introduced_by":9}],"inode":{"change":9,"pos":123281}}},"contents":[{"Del":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}},{"Replacement":{"inode":{"change":9,"pos":133619},"path":"pijul/src/commands/mod.rs","line":70,"ins":{"up_context":[{"change":9,"pos":18685}],"down_context":[{"change":9,"pos":18732}],"flag":"BLOCK","start":12749,"end":12779,"inode":{"change":9,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":18685},"to":{"change":9,"start":18685,"end":18732},"introduced_by":9}],"inode":{"change":9,"pos":133619}},"ins_contents":[{"Add":" txn: libpijul::ArcTxn,"}],"del_contents":[{"Del":" txn: std::sync::Arc>,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":133619},"path":"pijul/src/commands/mod.rs","line":81,"ins":{"up_context":[{"change":9,"pos":18896}],"down_context":[{"change":9,"pos":2068}],"flag":"BLOCK","start":12780,"end":12808,"inode":{"change":9,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":18896},"to":{"change":9,"start":18896,"end":18931},"introduced_by":9}],"inode":{"change":9,"pos":133619}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":133619},"path":"pijul/src/commands/mod.rs","line":90,"ins":{"up_context":[{"change":9,"pos":2179}],"down_context":[{"change":9,"pos":2179}],"flag":"BLOCK","start":12809,"end":12840,"inode":{"change":9,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2179},"to":{"change":9,"start":18996,"end":19036},"introduced_by":9}],"inode":{"change":9,"pos":133619}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":133619},"path":"pijul/src/commands/mod.rs","line":97,"ins":{"up_context":[{"change":9,"pos":19170}],"down_context":[{"change":9,"pos":19202}],"flag":"BLOCK","start":12841,"end":12864,"inode":{"change":9,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":19170},"to":{"change":9,"start":19170,"end":19202},"introduced_by":9}],"inode":{"change":9,"pos":133619}},"ins_contents":[{"Add":" c.into_inner()"}],"del_contents":[{"Del":" c.into_inner().unwrap()\n"}]}},{"Replacement":{"inode":{"change":9,"pos":133619},"path":"pijul/src/commands/mod.rs","line":110,"ins":{"up_context":[{"change":9,"pos":2561}],"down_context":[{"change":9,"pos":2646}],"flag":"BLOCK","start":12865,"end":12962,"inode":{"change":9,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2561},"to":{"change":9,"start":19281,"end":19379},"introduced_by":9}],"inode":{"change":9,"pos":133619}},"ins_contents":[{"Add":" libpijul::change::dependencies(&*txn, &*channel.read(), pending_change.changes.iter())?;"}],"del_contents":[{"Del":" libpijul::change::dependencies(&*txn, &*channel.read()?, pending_change.changes.iter())?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":134376},"path":"pijul/src/commands/log.rs","line":50,"ins":{"up_context":[{"change":9,"pos":135542}],"down_context":[{"change":9,"pos":12912}],"flag":"BLOCK","start":12963,"end":13027,"inode":{"change":9,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":135542},"to":{"change":9,"start":19380,"end":19445},"introduced_by":9}],"inode":{"change":9,"pos":134376}},"ins_contents":[{"Add":" for h in txn.reverse_log(&*channel.read(), None)? {"}],"del_contents":[{"Del":" for h in txn.reverse_log(&*channel.read()?, None)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":134376},"path":"pijul/src/commands/log.rs","line":60,"ins":{"up_context":[{"change":9,"pos":986}],"down_context":[{"change":9,"pos":17247}],"flag":"BLOCK","start":13028,"end":13092,"inode":{"change":9,"pos":134376}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":986},"to":{"change":9,"start":19446,"end":19511},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":135743},"to":{"change":9,"start":19446,"end":19511},"introduced_by":9}],"inode":{"change":9,"pos":134376}},"ins_contents":[{"Add":" for h in txn.reverse_log(&*channel.read(), None)? {"}],"del_contents":[{"Del":" for h in txn.reverse_log(&*channel.read()?, None)? {\n"}]}},{"Edit":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":12,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":137436},"to":{"change":9,"start":813,"end":843},"introduced_by":9}],"inode":{"change":9,"pos":137210}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":164,"ins":{"up_context":[{"change":9,"pos":141594}],"down_context":[{"change":9,"pos":141615}],"flag":"BLOCK","start":13093,"end":13118,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":141594},"to":{"change":9,"start":844,"end":873},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" txn: &ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":174,"ins":{"up_context":[{"change":9,"pos":142007}],"down_context":[{"change":9,"pos":142007}],"flag":"BLOCK","start":13119,"end":13166,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":142007},"to":{"change":9,"start":874,"end":930},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":252,"ins":{"up_context":[{"change":9,"pos":144061}],"down_context":[{"change":9,"pos":144111}],"flag":"BLOCK","start":13167,"end":13218,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":144061},"to":{"change":9,"start":0,"end":51},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let txn = repo.repo.pristine.arc_txn_begin()?;"}],"del_contents":[{"Del":" let txn = repo.repo.pristine.mut_txn_begin()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":256,"ins":{"up_context":[{"change":9,"pos":144237}],"down_context":[{"change":2,"pos":70}],"flag":"BLOCK","start":13219,"end":13296,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":144237},"to":{"change":2,"start":0,"end":70},"introduced_by":2}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let channel = if let Some(c) = txn.read().load_channel(&oid_)? {"}],"del_contents":[{"Del":" let channel = if let Some(c) = txn.load_channel(&oid_)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":261,"ins":{"up_context":[{"change":2,"pos":179}],"down_context":[{"change":9,"pos":144396}],"flag":"BLOCK","start":13297,"end":13414,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":179},"to":{"change":9,"start":976,"end":1005},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":162},"to":{"change":9,"start":976,"end":1005},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1005},"to":{"change":9,"start":931,"end":995},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let (_, &p) = txn"},{"Add":" .read()"},{"Add":" .changeid_reverse_log(&*channel.read(), None)?"}],"del_contents":[{"Del":" let (_, p) = txn\n"},{"Del":" .changeid_reverse_log(&*channel.read()?, None)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":293,"ins":{"up_context":[{"change":9,"pos":145484}],"down_context":[{"change":9,"pos":145484}],"flag":"BLOCK","start":13415,"end":13474,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":145484},"to":{"change":9,"start":996,"end":1105},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let txn = repo.repo.pristine.arc_txn_begin()?;"}],"del_contents":[{"Del":" let txn = repo.repo.pristine.mut_txn_begin()?;\n let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":303,"ins":{"up_context":[{"change":9,"pos":145980}],"down_context":[{"change":9,"pos":389}],"flag":"BLOCK","start":13475,"end":13522,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":145980},"to":{"change":9,"start":1184,"end":1240},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":313,"ins":{"up_context":[{"change":9,"pos":146349}],"down_context":[{"change":9,"pos":146349}],"flag":"BLOCK","start":13523,"end":13570,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":146349},"to":{"change":9,"start":1241,"end":1297},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":319,"ins":{"up_context":[{"change":9,"pos":146516}],"down_context":[{"change":9,"pos":146874}],"flag":"BLOCK","start":13571,"end":13754,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":146516},"to":{"change":9,"start":146516,"end":146606},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":146606},"to":{"change":9,"start":1298,"end":1368},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":1368},"to":{"change":9,"start":146670,"end":146777},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":146670},"to":{"change":9,"start":146670,"end":146777},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":146777},"to":{"change":9,"start":971,"end":1094},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" import_commit_parents(repo, dag, &txn, &channel, &oid, &mut ws, &mut stats)?;"},{"Add":" let state = import_commit(git, repo, &txn, &channel, &oid, &mut stats)?;"}],"del_contents":[{"Del":" import_commit_parents(\n repo,\n dag,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" &oid,\n &mut ws,\n &mut stats,\n )?;\n"},{"Del":" let state =\n import_commit(git, repo, txn.clone(), channel.clone(), &oid, &mut stats)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":322,"ins":{"up_context":[{"change":9,"pos":146925}],"down_context":[{"change":9,"pos":146995}],"flag":"BLOCK","start":13755,"end":13821,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":146925},"to":{"change":9,"start":1473,"end":1546},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" dag.collect_dead_parents(&oid, &mut todo, &txn)?;"}],"del_contents":[{"Del":" dag.collect_dead_parents(&oid, &mut todo, txn.clone())?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":335,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":147512},"to":{"change":9,"start":1547,"end":1718},"introduced_by":9}],"inode":{"change":9,"pos":137210}}},"contents":[{"Del":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":363,"ins":{"up_context":[{"change":9,"pos":148197}],"down_context":[{"change":9,"pos":148239}],"flag":"BLOCK","start":13822,"end":13872,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":148197},"to":{"change":9,"start":1719,"end":1772},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":372,"ins":{"up_context":[{"change":9,"pos":148491}],"down_context":[{"change":9,"pos":148491}],"flag":"BLOCK","start":13873,"end":13903,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":148491},"to":{"change":9,"start":1773,"end":1812},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":386,"ins":{"up_context":[{"change":9,"pos":131}],"down_context":[{"change":9,"pos":594}],"flag":"BLOCK","start":13904,"end":13959,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":131},"to":{"change":9,"start":1813,"end":1869},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" for x in txn.log(&*p_channel.read(), 0)? {"}],"del_contents":[{"Del":" for x in txn.log(&*p_channel.read()?, 0)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":412,"ins":{"up_context":[{"change":9,"pos":149856}],"down_context":[{"change":9,"pos":149906}],"flag":"BLOCK","start":13960,"end":14010,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":149856},"to":{"change":9,"start":1958,"end":2011},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":419,"ins":{"up_context":[{"change":9,"pos":150070}],"down_context":[{"change":9,"pos":150152}],"flag":"BLOCK","start":14011,"end":14096,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":150070},"to":{"change":9,"start":2012,"end":2111},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let (needs_output, to_apply) = make_apply_plan(repo, &txn, &channel, dag, oid)?;"}],"del_contents":[{"Del":" let (needs_output, to_apply) = make_apply_plan(repo, txn.clone(), channel.clone(), dag, oid)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":424,"ins":{"up_context":[{"change":9,"pos":150285}],"down_context":[{"change":9,"pos":150285}],"flag":"BLOCK","start":14097,"end":14129,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":150285},"to":{"change":9,"start":2112,"end":2153},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn_ = txn.write();"}],"del_contents":[{"Del":" let mut txn_ = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":426,"ins":{"up_context":[{"change":9,"pos":150321}],"down_context":[{"change":9,"pos":2207}],"flag":"BLOCK","start":14130,"end":14174,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":150321},"to":{"change":9,"start":2154,"end":2207},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut channel_ = channel.write();"}],"del_contents":[{"Del":" let mut channel_ = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":435,"ins":{"up_context":[{"change":9,"pos":150649}],"down_context":[{"change":9,"pos":150714}],"flag":"BLOCK","start":14175,"end":14258,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":150649},"to":{"change":9,"start":2428,"end":2512},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, &*txn_, &*channel.read(), line!())?;"}],"del_contents":[{"Del":" check_alive_debug(&repo.repo.changes, &*txn_, &*channel.read()?, line!())?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":447,"ins":{"up_context":[{"change":9,"pos":2635}],"down_context":[{"change":9,"pos":151374}],"flag":"BLOCK","start":14259,"end":14296,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2635},"to":{"change":9,"start":2635,"end":2679},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" &repo.repo.working_copy,"}],"del_contents":[{"Del":" repo.repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":449,"ins":{"up_context":[{"change":9,"pos":151406}],"down_context":[{"change":9,"pos":151427}],"flag":"BLOCK","start":14297,"end":14337,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":151406},"to":{"change":9,"start":2680,"end":2734},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":459,"ins":{"up_context":[{"change":9,"pos":151569}],"down_context":[{"change":9,"pos":151638}],"flag":"BLOCK","start":14338,"end":14457,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":151569},"to":{"change":9,"start":2765,"end":2902},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" check_alive_debug(&repo.repo.changes, &*txn, &channel.read(), line!())?;"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n check_alive_debug(&repo.repo.changes, &*txn, &channel.read().unwrap(), line!())?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":467,"ins":{"up_context":[{"change":9,"pos":151772}],"down_context":[{"change":9,"pos":151823}],"flag":"BLOCK","start":14458,"end":14551,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":151772},"to":{"change":9,"start":2903,"end":3014},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" check_tree_inodes(&*txn, txn.graph(&*channel.read()));"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n check_tree_inodes(&*txn, txn.graph(&*channel.read().unwrap()));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":479,"ins":{"up_context":[{"change":9,"pos":152048}],"down_context":[{"change":9,"pos":152098}],"flag":"BLOCK","start":14552,"end":14602,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":152048},"to":{"change":9,"start":3015,"end":3068},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":534,"ins":{"up_context":[{"change":9,"pos":153980}],"down_context":[{"change":9,"pos":153980}],"flag":"BLOCK","start":14603,"end":14642,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":153980},"to":{"change":9,"start":3069,"end":3117},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":621,"ins":{"up_context":[{"change":9,"pos":157665}],"down_context":[{"change":9,"pos":157715}],"flag":"BLOCK","start":14643,"end":14693,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":157665},"to":{"change":9,"start":3302,"end":3355},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":626,"ins":{"up_context":[{"change":9,"pos":3958}],"down_context":[{"change":9,"pos":319}],"flag":"BLOCK","start":14694,"end":14776,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3958},"to":{"change":9,"start":3356,"end":3452},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let (object, prefixes) = git_reset(git, repo, &txn, &channel, child, stats)?;"}],"del_contents":[{"Del":" let (object, prefixes) = git_reset(git, repo, txn.clone(), channel.clone(), child, stats)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":628,"ins":{"up_context":[{"change":9,"pos":360}],"down_context":[{"change":9,"pos":157898}],"flag":"BLOCK","start":14777,"end":14809,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":360},"to":{"change":9,"start":3452,"end":3493},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3452},"to":{"change":9,"start":3452,"end":3493},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn_ = txn.write();"}],"del_contents":[{"Del":" let mut txn_ = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":643,"ins":{"up_context":[{"change":9,"pos":158287}],"down_context":[{"change":9,"pos":158352}],"flag":"BLOCK","start":14810,"end":14879,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":158287},"to":{"change":9,"start":1231,"end":1331},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" debug!(\"recording on channel {:?}\", txn_.name(&channel.read()));"}],"del_contents":[{"Del":" debug!(\n \"recording on channel {:?}\",\n txn_.name(&channel.read().unwrap())\n );\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":670,"ins":{"up_context":[{"change":9,"pos":158491}],"down_context":[{"change":9,"pos":158558}],"flag":"BLOCK","start":14880,"end":14945,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":158491},"to":{"change":9,"start":3733,"end":3819},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"},{"Add":" &repo.repo.working_copy,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n repo.repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":691,"ins":{"up_context":[{"change":4,"pos":354}],"down_context":[{"change":4,"pos":465}],"flag":"BLOCK","start":14946,"end":15039,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":354},"to":{"change":4,"start":354,"end":465},"introduced_by":4}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn = txn.write();"},{"Add":" let name = txn.name(&channel.read()).to_string();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n let name = txn.name(&channel.read().unwrap()).to_string();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":695,"ins":{"up_context":[{"change":4,"pos":512}],"down_context":[{"change":9,"pos":159191}],"flag":"BLOCK","start":15040,"end":15066,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":513},"to":{"change":9,"start":3820,"end":3855},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":159191},"to":{"change":9,"start":3820,"end":3855},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":700,"ins":{"up_context":[{"change":9,"pos":404}],"down_context":[{"change":9,"pos":474}],"flag":"BLOCK","start":15067,"end":15127,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":404},"to":{"change":9,"start":3856,"end":3925},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" return Ok(txn.current_state(&channel.read())?);"}],"del_contents":[{"Del":" return Ok(txn.current_state(&channel.read().unwrap())?);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":707,"ins":{"up_context":[{"change":9,"pos":159718}],"down_context":[{"change":9,"pos":159783}],"flag":"BLOCK","start":15128,"end":15209,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":159718},"to":{"change":9,"start":3926,"end":4016},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, &*txn, &channel.read(), line!())?;"}],"del_contents":[{"Del":" check_alive_debug(&repo.repo.changes, &*txn, &channel.read().unwrap(), line!())?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":714,"ins":{"up_context":[{"change":9,"pos":160168}],"down_context":[{"change":9,"pos":160219}],"flag":"BLOCK","start":15210,"end":15272,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":160168},"to":{"change":9,"start":4173,"end":4244},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" check_tree_inodes(&*txn, txn.graph(&channel.read()));"}],"del_contents":[{"Del":" check_tree_inodes(&*txn, txn.graph(&channel.read().unwrap()));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":724,"ins":{"up_context":[{"change":9,"pos":1625}],"down_context":[{"change":9,"pos":160570}],"flag":"BLOCK","start":15273,"end":15378,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":1625},"to":{"change":9,"start":4382,"end":4494},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4382},"to":{"change":9,"start":4382,"end":4494},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"},{"Add":" working_copy: &libpijul::working_copy::FileSystem,"}],"del_contents":[{"Del":" txn: Arc>,\n channel: ChannelRef,\n working_copy: Arc,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":757,"ins":{"up_context":[{"change":9,"pos":161002}],"down_context":[{"change":9,"pos":161002}],"flag":"BLOCK","start":15379,"end":15410,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":161002},"to":{"change":9,"start":4997,"end":5037},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":759,"ins":{"up_context":[{"change":9,"pos":161034}],"down_context":[{"change":9,"pos":161102}],"flag":"BLOCK","start":15411,"end":15494,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":161034},"to":{"change":9,"start":1394,"end":1447},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1447},"to":{"change":9,"start":1626,"end":1717},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":1717},"to":{"change":9,"start":1514,"end":1526},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":5112},"to":{"change":9,"start":1514,"end":1526},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1514},"to":{"change":9,"start":1514,"end":1526},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" return Ok((0, None, txn.current_state(&channel.read()).map_err(TxnErr)?));"}],"del_contents":[{"Del":" return Ok((\n 0,\n None,\n"},{"Del":" txn.current_state(&channel.read().unwrap())\n .map_err(TxnErr)?,\n"},{"Del":" ));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":768,"ins":{"up_context":[{"change":9,"pos":1614}],"down_context":[{"change":9,"pos":161362}],"flag":"BLOCK","start":15495,"end":15576,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1614},"to":{"change":9,"start":5164,"end":5254},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" libpijul::change::dependencies(&*txn, &channel.read(), actions.iter())?;"}],"del_contents":[{"Del":" libpijul::change::dependencies(&*txn, &channel.read().unwrap(), actions.iter())?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":137210},"path":"pijul/src/commands/git.rs","line":773,"ins":{"up_context":[{"change":9,"pos":161474}],"down_context":[{"change":9,"pos":161496}],"flag":"BLOCK","start":15577,"end":15643,"inode":{"change":9,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":161474},"to":{"change":9,"start":5289,"end":5364},"introduced_by":9}],"inode":{"change":9,"pos":137210}},"ins_contents":[{"Add":" std::mem::replace(&mut *rec.contents.lock(), Vec::new()),"}],"del_contents":[{"Del":" std::mem::replace(&mut *rec.contents.lock().unwrap(), Vec::new()),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":167873},"path":"pijul/src/commands/fork.rs","line":32,"ins":{"up_context":[{"change":9,"pos":5516}],"down_context":[{"change":9,"pos":13204}],"flag":"BLOCK","start":15644,"end":15691,"inode":{"change":9,"pos":167873}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":5516},"to":{"change":9,"start":5516,"end":5572},"introduced_by":9}],"inode":{"change":9,"pos":167873}},"ins_contents":[{"Add":" let mut channel = channel.write();"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Edit":{"inode":{"change":9,"pos":167873},"path":"pijul/src/commands/fork.rs","line":35,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":168764}],"down_context":[{"change":9,"pos":2740}],"flag":"BLOCK","start":15692,"end":15834,"inode":{"change":9,"pos":167873}}},"contents":[{"Add":" let cur = txn"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}]}},{"Replacement":{"inode":{"change":9,"pos":167873},"path":"pijul/src/commands/fork.rs","line":42,"ins":{"up_context":[{"change":9,"pos":2846}],"down_context":[{"change":9,"pos":2958}],"flag":"BLOCK","start":15835,"end":15879,"inode":{"change":9,"pos":167873}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2846},"to":{"change":9,"start":2846,"end":2958},"introduced_by":9}],"inode":{"change":9,"pos":167873}},"ins_contents":[{"Add":" cur.as_str()"},{"Add":" };"}],"del_contents":[{"Del":" txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)\n }\n .to_string();\n"}]}},{"Edit":{"inode":{"change":9,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":32},"to":{"change":9,"start":19512,"end":19542},"introduced_by":9}],"inode":{"change":9,"pos":169058}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":121,"ins":{"up_context":[{"change":8,"pos":405}],"down_context":[{"change":9,"pos":192}],"flag":"BLOCK","start":15880,"end":15930,"inode":{"change":9,"pos":169058}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":405},"to":{"change":9,"start":19543,"end":19593},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":9,"pos":23934},"to":{"change":9,"start":19543,"end":19593},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":13499},"to":{"change":9,"start":19543,"end":19593},"introduced_by":9}],"inode":{"change":9,"pos":169058}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"}],"del_contents":[{"Del":" let txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":125,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":44},"to":{"change":9,"start":19594,"end":19640},"introduced_by":9}],"inode":{"change":9,"pos":169058}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":151,"ins":{"up_context":[{"change":9,"pos":172105}],"down_context":[{"change":9,"pos":562}],"flag":"BLOCK","start":15931,"end":15974,"inode":{"change":9,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":172105},"to":{"change":9,"start":19679,"end":19731},"introduced_by":9}],"inode":{"change":9,"pos":169058}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Edit":{"inode":{"change":9,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":165,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":172406},"to":{"change":9,"start":172406,"end":172416},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":172416},"to":{"change":9,"start":19732,"end":19873},"introduced_by":9}],"inode":{"change":9,"pos":169058}}},"contents":[{"Del":" }\n"},{"Del":" if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap().commit()?;\n } else {\n unreachable!()\n"}]}},{"Edit":{"inode":{"change":9,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":166,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":19883}],"down_context":[{"change":9,"pos":172439}],"flag":"BLOCK","start":15975,"end":15998,"inode":{"change":9,"pos":169058}}},"contents":[{"Add":" txn.commit()?;"}]}},{"Edit":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":173738},"to":{"change":9,"start":19884,"end":19914},"introduced_by":9}],"inode":{"change":9,"pos":173551}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":37,"ins":{"up_context":[{"change":9,"pos":24070}],"down_context":[{"change":9,"pos":174231}],"flag":"BLOCK","start":15999,"end":16049,"inode":{"change":9,"pos":173551}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":20012},"to":{"change":9,"start":787,"end":841},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":24070},"to":{"change":9,"start":787,"end":841},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":15538},"to":{"change":9,"start":787,"end":841},"introduced_by":9}],"inode":{"change":9,"pos":173551}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":39,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":174275}],"down_context":[{"change":9,"pos":3061}],"flag":"BLOCK","start":16050,"end":16196,"inode":{"change":9,"pos":173551}}},"contents":[{"Add":" let cur = txn"},{"Add":" .read()"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}]}},{"Replacement":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":47,"ins":{"up_context":[{"change":9,"pos":3150}],"down_context":[{"change":9,"pos":174398}],"flag":"BLOCK","start":16197,"end":16302,"inode":{"change":9,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3150},"to":{"change":9,"start":3150,"end":3311},"introduced_by":9}],"inode":{"change":9,"pos":173551}},"ins_contents":[{"Add":" cur.as_str()"},{"Add":" };"},{"Add":" let channel = txn.write().open_or_create_channel(&channel)?;"}],"del_contents":[{"Del":" txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)\n }\n .to_string();\n let channel = txn.open_or_create_channel(&channel)?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":52,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":174455},"to":{"change":9,"start":20036,"end":20082},"introduced_by":9}],"inode":{"change":9,"pos":173551}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":57,"ins":{"up_context":[{"change":9,"pos":20172}],"down_context":[{"change":9,"pos":174663}],"flag":"BLOCK","start":16303,"end":16339,"inode":{"change":9,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":20172},"to":{"change":9,"start":20172,"end":20215},"introduced_by":9}],"inode":{"change":9,"pos":173551}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":79,"ins":{"up_context":[{"change":9,"pos":175145}],"down_context":[{"change":9,"pos":175145}],"flag":"BLOCK","start":16340,"end":16371,"inode":{"change":9,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":175145},"to":{"change":9,"start":20313,"end":20353},"introduced_by":9}],"inode":{"change":9,"pos":173551}},"ins_contents":[{"Add":" let txn = txn.write();"}],"del_contents":[{"Del":" let txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":86,"ins":{"up_context":[{"change":9,"pos":20493}],"down_context":[{"change":9,"pos":20532}],"flag":"BLOCK","start":16372,"end":16402,"inode":{"change":9,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":20493},"to":{"change":9,"start":20493,"end":20532},"introduced_by":9}],"inode":{"change":9,"pos":173551}},"ins_contents":[{"Add":" cont.into_inner()"}],"del_contents":[{"Del":" cont.into_inner().unwrap()\n"}]}},{"Replacement":{"inode":{"change":9,"pos":173551},"path":"pijul/src/commands/diff.rs","line":102,"ins":{"up_context":[{"change":9,"pos":175615}],"down_context":[{"change":9,"pos":175679}],"flag":"BLOCK","start":16403,"end":16477,"inode":{"change":9,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":175615},"to":{"change":9,"start":20680,"end":20755},"introduced_by":9}],"inode":{"change":9,"pos":173551}},"ins_contents":[{"Add":" dependencies(&*txn, &*channel.read(), change.changes.iter())?"}],"del_contents":[{"Del":" dependencies(&*txn, &*channel.read()?, change.changes.iter())?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":177758},"path":"pijul/src/commands/debug.rs","line":46,"ins":{"up_context":[{"change":9,"pos":21604}],"down_context":[{"change":9,"pos":21648}],"flag":"BLOCK","start":16478,"end":16521,"inode":{"change":9,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":21604},"to":{"change":9,"start":21604,"end":21648},"introduced_by":9}],"inode":{"change":9,"pos":177758}},"ins_contents":[{"Add":" &channel.read().graph,"}],"del_contents":[{"Del":" &channel.read()?.graph,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":177758},"path":"pijul/src/commands/debug.rs","line":52,"ins":{"up_context":[{"change":9,"pos":21794}],"down_context":[{"change":9,"pos":21841}],"flag":"BLOCK","start":16522,"end":16568,"inode":{"change":9,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":21794},"to":{"change":9,"start":21794,"end":21841},"introduced_by":9}],"inode":{"change":9,"pos":177758}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":177758},"path":"pijul/src/commands/debug.rs","line":55,"ins":{"up_context":[{"change":9,"pos":21940}],"down_context":[{"change":9,"pos":177}],"flag":"BLOCK","start":16569,"end":16663,"inode":{"change":9,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":21940},"to":{"change":9,"start":21940,"end":22035},"introduced_by":9}],"inode":{"change":9,"pos":177758}},"ins_contents":[{"Add":" libpijul::pristine::check_alive_debug(&repo.changes, &txn, &*channel.read(), 0)?;"}],"del_contents":[{"Del":" libpijul::pristine::check_alive_debug(&repo.changes, &txn, &*channel.read()?, 0)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":177758},"path":"pijul/src/commands/debug.rs","line":59,"ins":{"up_context":[{"change":9,"pos":50}],"down_context":[{"change":9,"pos":22075}],"flag":"BLOCK","start":16664,"end":16702,"inode":{"change":9,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":50},"to":{"change":9,"start":22036,"end":22075},"introduced_by":9}],"inode":{"change":9,"pos":177758}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":178684},"path":"pijul/src/commands/credit.rs","line":53,"ins":{"up_context":[{"change":9,"pos":237}],"down_context":[{"change":9,"pos":0}],"flag":"BLOCK","start":16703,"end":16741,"inode":{"change":9,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":237},"to":{"change":9,"start":22165,"end":22212},"introduced_by":9}],"inode":{"change":9,"pos":178684}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read().unwrap();\n"}]}},{"Edit":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2958},"to":{"change":9,"start":22363,"end":22393},"introduced_by":9}],"inode":{"change":9,"pos":182891}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":76,"ins":{"up_context":[{"change":9,"pos":15873}],"down_context":[{"change":9,"pos":184907}],"flag":"BLOCK","start":16742,"end":16870,"inode":{"change":9,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":15873},"to":{"change":9,"start":842,"end":896},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":896},"to":{"change":9,"start":184837,"end":184907},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":184837},"to":{"change":9,"start":184837,"end":184907},"introduced_by":9}],"inode":{"change":9,"pos":182891}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let mut channel = txn.write().open_or_create_channel(&self.channel)?;"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"},{"Del":" let mut channel = txn.open_or_create_channel(&self.channel)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":81,"ins":{"up_context":[{"change":9,"pos":185011}],"down_context":[{"change":9,"pos":185079}],"flag":"BLOCK","start":16871,"end":16948,"inode":{"change":9,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":185011},"to":{"change":9,"start":185011,"end":185079},"introduced_by":9}],"inode":{"change":9,"pos":182891}},"ins_contents":[{"Add":" .clone_tag(&mut repo, &mut *txn.write(), &mut channel, &[h])"}],"del_contents":[{"Del":" .clone_tag(&mut repo, &mut txn, &mut channel, &[h])\n"}]}},{"Replacement":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":86,"ins":{"up_context":[{"change":9,"pos":185211}],"down_context":[{"change":9,"pos":185289}],"flag":"BLOCK","start":16949,"end":17025,"inode":{"change":9,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":185211},"to":{"change":9,"start":13751,"end":13818},"introduced_by":9}],"inode":{"change":9,"pos":182891}},"ins_contents":[{"Add":" .clone_state(&mut repo, &mut *txn.write(), &mut channel, h)"}],"del_contents":[{"Del":" .clone_state(&mut repo, &mut txn, &mut channel, h)\n"}]}},{"Replacement":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":90,"ins":{"up_context":[{"change":9,"pos":185349}],"down_context":[{"change":9,"pos":185566}],"flag":"BLOCK","start":17026,"end":17221,"inode":{"change":9,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":185349},"to":{"change":9,"start":13819,"end":13906},"introduced_by":9}],"inode":{"change":9,"pos":182891}},"ins_contents":[{"Add":" .clone_channel("},{"Add":" &mut repo,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut channel,"},{"Add":" &self.partial_paths,"},{"Add":" )"}],"del_contents":[{"Del":" .clone_channel(&mut repo, &mut txn, &mut channel, &self.partial_paths)\n"}]}},{"Edit":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":99,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":22558},"to":{"change":9,"start":22558,"end":22604},"introduced_by":9}],"inode":{"change":9,"pos":182891}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":100,"ins":{"up_context":[{"change":9,"pos":22660}],"down_context":[{"change":9,"pos":185679}],"flag":"BLOCK","start":17222,"end":17254,"inode":{"change":9,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":22660},"to":{"change":9,"start":22660,"end":22699},"introduced_by":9}],"inode":{"change":9,"pos":182891}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":102,"ins":{"up_context":[{"change":9,"pos":185706}],"down_context":[{"change":9,"pos":185732}],"flag":"BLOCK","start":17255,"end":17295,"inode":{"change":9,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":185706},"to":{"change":9,"start":22700,"end":22746},"introduced_by":9}],"inode":{"change":9,"pos":182891}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel,\n"}]}},{"Replacement":{"inode":{"change":9,"pos":182891},"path":"pijul/src/commands/clone.rs","line":111,"ins":{"up_context":[{"change":9,"pos":534}],"down_context":[{"change":9,"pos":185778}],"flag":"BLOCK","start":17296,"end":17353,"inode":{"change":9,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":534},"to":{"change":9,"start":3747,"end":3807},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":3807},"to":{"change":9,"start":22833,"end":22924},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":22833},"to":{"change":9,"start":22833,"end":22924},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":22924},"to":{"change":9,"start":3808,"end":3857},"introduced_by":9}],"inode":{"change":9,"pos":182891}},"ins_contents":[{"Add":" txn.write().set_current_channel(&self.channel)?;"}],"del_contents":[{"Del":" let mut txn = if let Ok(t) = Arc::try_unwrap(txn) {\n"},{"Del":" t.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"},{"Del":" txn.set_current_channel(&self.channel)?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":186892},"path":"pijul/src/commands/channel.rs","line":47,"ins":{"up_context":[{"change":9,"pos":23190}],"down_context":[{"change":9,"pos":23241}],"flag":"BLOCK","start":17354,"end":17404,"inode":{"change":9,"pos":186892}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":23190},"to":{"change":9,"start":23190,"end":23241},"introduced_by":9}],"inode":{"change":9,"pos":186892}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read()?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":189306},"path":"pijul/src/commands/change.rs","line":35,"ins":{"up_context":[{"change":9,"pos":243}],"down_context":[{"change":9,"pos":23337}],"flag":"BLOCK","start":17405,"end":17447,"inode":{"change":9,"pos":189306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":243},"to":{"change":9,"start":23294,"end":23337},"introduced_by":9}],"inode":{"change":9,"pos":189306}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read()?;\n"}]}},{"Edit":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3361},"to":{"change":9,"start":23410,"end":23440},"introduced_by":9}],"inode":{"change":9,"pos":194289}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":6,"ins":{"up_context":[{"change":9,"pos":194383}],"down_context":[{"change":9,"pos":23441}],"flag":"BLOCK","start":17448,"end":17503,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":194383},"to":{"change":9,"start":553,"end":617},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":"use libpijul::{DepsTxnT, GraphTxnT, MutTxnTExt, TxnT};"}],"del_contents":[{"Del":"use libpijul::{DepsTxnT, GraphTxnT, MutTxnT, MutTxnTExt, TxnT};\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":31,"ins":{"up_context":[{"change":9,"pos":25009}],"down_context":[{"change":9,"pos":4895}],"flag":"BLOCK","start":17504,"end":17700,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":23541},"to":{"change":9,"start":1086,"end":1140},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":25009},"to":{"change":9,"start":1086,"end":1140},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":16700},"to":{"change":9,"start":1086,"end":1140},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1140},"to":{"change":9,"start":4820,"end":4895},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let cur = txn"},{"Add":" .read()"},{"Add":" .current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string();"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"},{"Del":" let cur = txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL);\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":40,"ins":{"up_context":[{"change":9,"pos":4989}],"down_context":[{"change":9,"pos":5005}],"flag":"BLOCK","start":17701,"end":17726,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":4989},"to":{"change":9,"start":4989,"end":5005},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" cur.as_str()"}],"del_contents":[{"Del":" cur\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":43,"ins":{"up_context":[{"change":9,"pos":5070}],"down_context":[{"change":9,"pos":195133}],"flag":"BLOCK","start":17727,"end":17814,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":5070},"to":{"change":9,"start":5573,"end":5653},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":2922},"to":{"change":9,"start":5573,"end":5653},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.read().load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(&channel_name)? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":50,"ins":{"up_context":[{"change":9,"pos":855}],"down_context":[{"change":9,"pos":195519}],"flag":"BLOCK","start":17815,"end":17888,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":855},"to":{"change":9,"start":855,"end":921},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" hashes.push(if let Ok(h) = txn.read().hash_from_prefix(ch) {"}],"del_contents":[{"Del":" hashes.push(if let Ok(h) = txn.hash_from_prefix(ch) {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":77,"ins":{"up_context":[{"change":9,"pos":1173}],"down_context":[{"change":9,"pos":196040}],"flag":"BLOCK","start":17889,"end":18047,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1173},"to":{"change":9,"start":5654,"end":5710},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":5710},"to":{"change":9,"start":14215,"end":14301},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1173},"to":{"change":9,"start":14215,"end":14301},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" let mut channel = channel.write();"},{"Add":" txn.write()"},{"Add":" .apply_deps_rec(&repo.changes, &mut channel, hashes.last().unwrap())?;"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"},{"Del":" txn.apply_deps_rec(&repo.changes, &mut channel, hashes.last().unwrap())?;\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":81,"ins":{"up_context":[{"change":9,"pos":196057}],"down_context":[{"change":9,"pos":14302}],"flag":"BLOCK","start":18048,"end":18134,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":196057},"to":{"change":9,"start":5711,"end":5767},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" let mut channel = channel.write();"},{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Edit":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":89,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":23685}],"down_context":[{"change":9,"pos":661}],"flag":"BLOCK","start":18135,"end":18166,"inode":{"change":9,"pos":194289}}},"contents":[{"Add":" let txn_ = txn.read();"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":91,"ins":{"up_context":[{"change":9,"pos":694}],"down_context":[{"change":9,"pos":14405}],"flag":"BLOCK","start":18167,"end":18230,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":694},"to":{"change":9,"start":14343,"end":14405},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" if let Some(int) = txn_.get_internal(&d.into())? {"}],"del_contents":[{"Del":" if let Some(int) = txn.get_internal(&d.into())? {\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":93,"ins":{"up_context":[{"change":9,"pos":14448}],"down_context":[{"change":9,"pos":14449}],"flag":"BLOCK","start":18231,"end":18290,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":9,"pos":14448},"to":{"change":9,"start":749,"end":807},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":749},"to":{"change":9,"start":749,"end":807},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" for inode in txn_.iter_rev_touched(int)? {"}],"del_contents":[{"Del":" for inode in txn.iter_rev_touched(int)? {\n"}]}},{"Edit":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":105,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":1106}],"down_context":[{"change":9,"pos":1106}],"flag":"BLOCK","start":18291,"end":18321,"inode":{"change":9,"pos":194289}}},"contents":[{"Add":" std::mem::drop(txn_);"}]}},{"Edit":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":107,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1107},"to":{"change":9,"start":23686,"end":23732},"introduced_by":9}],"inode":{"change":9,"pos":194289}}},"contents":[{"Del":" let txn = Arc::new(RwLock::new(txn));\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":109,"ins":{"up_context":[{"change":9,"pos":3026}],"down_context":[{"change":9,"pos":3026}],"flag":"BLOCK","start":18322,"end":18357,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3026},"to":{"change":9,"start":23733,"end":23777},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" let txn_ = txn.read();"}],"del_contents":[{"Del":" let txn_ = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":112,"ins":{"up_context":[{"change":9,"pos":3098}],"down_context":[{"change":9,"pos":3193}],"flag":"BLOCK","start":18358,"end":18454,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3098},"to":{"change":9,"start":23778,"end":23875},"introduced_by":9}],"inode":{"change":9,"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.read()?, false, i)?\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":130,"ins":{"up_context":[{"change":9,"pos":23975}],"down_context":[{"change":9,"pos":3524}],"flag":"BLOCK","start":18455,"end":18495,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":23975},"to":{"change":9,"start":23975,"end":24022},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":132,"ins":{"up_context":[{"change":9,"pos":3559}],"down_context":[{"change":9,"pos":3593}],"flag":"BLOCK","start":18496,"end":18552,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3559},"to":{"change":9,"start":24023,"end":24093},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":143,"ins":{"up_context":[{"change":9,"pos":24196}],"down_context":[{"change":9,"pos":3843}],"flag":"BLOCK","start":18553,"end":18593,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":24196},"to":{"change":9,"start":24196,"end":24243},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" &repo.working_copy,"}],"del_contents":[{"Del":" repo.working_copy.clone(),\n"}]}},{"Replacement":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":145,"ins":{"up_context":[{"change":9,"pos":3878}],"down_context":[{"change":9,"pos":3912}],"flag":"BLOCK","start":18594,"end":18650,"inode":{"change":9,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3878},"to":{"change":9,"start":24244,"end":24314},"introduced_by":9}],"inode":{"change":9,"pos":194289}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn.clone(),\n channel.clone(),\n"}]}},{"Edit":{"inode":{"change":9,"pos":194289},"path":"pijul/src/commands/apply.rs","line":156,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1652},"to":{"change":9,"start":24353,"end":24504},"introduced_by":9}],"inode":{"change":9,"pos":194289}}},"contents":[{"Del":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {\n txn.into_inner().unwrap()\n } else {\n unreachable!()\n };\n"}]}}],"owner":"irevoire","repo":"pijul","token":"JEnLDG05sQT5zwt21iWYYjzTJMccZdjD/O7Nr/T6mU0=","login":null}

…

Dependencies

Change contents