{"header":{"message":"Tag synchronisation","description":null,"timestamp":"2021-12-21T10:55:46.448270721Z","authors":[{}]},"hash":"DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","Tag synchronisation"],["AA",null],["2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC","Displaying errors returned by the server in the protocol"],["FGVTXN52IVYIDIBPFOOUE7QQAZMPJQRADGKXW3DENIC6EVS4AYFAC","Filter linebreak from http::get_state() response"],["3OW3YNZXF6DR2EI5XS7PDHUUZMARDU2JUJFJKIEWXQNSMCIBVAOQC","Dependencies completion in push and pull, updated after stabilisation of remote caches"],["YD7QFAD7XC35U5N4DOS3B4MBJL4KWSHVEZ6OLO5RYXOUPFQNPQPAC","Simplifying pijul::remote::PushDelta"],["ILZ44DEYAPNWZRHHEML2GPNSMGP4QXXI4GCL4T24R7A4LKGRV23AC","simplify outputting with no touched paths"],["JZADJIA3P3EOKPBGEKEXJVGWHNF2SIHYNNMB3XFNPBU4BTVGM3YQC","Handling HTTP errors"],["TA5VXGFGDBLENEH4SRHD7FOUXPXRKIHN7DIBUREW3DZHMDVJNNCAC","Fixing compilation errors"],["5MRZLKBHOFFUAJELWL34XILG2XVWPUEHOFPDXBK5ASCO6H26MBFAC","Changing the type of the tags db, to make it identical to remote tags"],["CQ3FIUY4HDRAI3EQWJ7D5VHLC4EBO2LHWVRHX56XA6LRGEKP63EAC","Fixing tag corruption"],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["L5IUD2DSLEK4SYPF6PLNO7C3TZEFYFHNM42HGEHY5VWW5MHD7CXAC","Fixing the regular expression parsing the protocol lines"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","Fixing a panic in pull"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["K4CVMIUKNWBZ676IKSR5MYKTCDPPCRGWVAGYU772CE2B3AGAP4KQC","Do not present changes we know as \"unknown\" on the remote"],["JLVRAJA5Z5DNBKHZDLT6QTKJ4LLJ547S4DH7X4A3XTB6234O5XDQC","Using iter_graph in pijul"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["N3X5YP7PV2XVQKRRWSRCGJG34HZPLV4BGBLZGJG55KGIB7ORJ77QC","Adding tag/txn.rs, now that the parser allows it"],["FE5ES6Q46FMWYPNNNJLORY377QGDE57LBBDIVWDTC6Z7U4U73NEQC","Stop pushing/pulling if the remote returns an error"],["GYXIF25T2BCTCWCQI5DQOF3F4HBWDJUDJUMZ2WLHVBIOYATJTFAQC","Proper parsing of URLs"],["RM225IDQR36MNBMN7OT2R562M4FUD6L34RY7A3WDBBETZIIDKZ5AC","Exchanging tagged states over SSH"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["WLUID7NANDWTN5GOECNEKFTLZF3MUVS7K26YWLYLSGJ56G63NV4QC","Do not block when downloading more than 100 changes over SSH"],["YS2HLPX6S3FCPI3Q7TVFP3XIZPK4JRKV6PFWRNZHCWWC2P2SDDLQC","Don't propose an empty list of changes to push"],["2V33SO6IVPKBRPIJ3U3WYD6QKGN36BJVPP3M2YUDN7GTX3YH5UCAC","dont unwrap name() for RemoteRepo::LocalChannel"],["7SQ7COLT73S6WT7H4ILJOQYRLYJVVYK4FWWCQ7TP6BVL5XMXMX3QC","Add length check to pijul remote delete"],["3ZAS64J675LPNHM2X32RH45B4A2LGK7NAIFDGQBQLDDSZVWEBTIQC","Solving conflicts"],["PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","Progress bar for upload and apply"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["AI73GKAO5QBPR6YGW7H5UNZYAEGYGIHAFO6DM2DWCPMVYLHE547QC","Adding a UserAgent header to the http downloader"],["L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC","Downloading changelists from channels without an id (Nest discussions)"],["UTEVDVGBBJZWMPQIM3NSSVN2GNBMY6I6FTAVXER7NMVBQSYKAVBAC","Don't hardlink the same changefile twice"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","Converting to the new patch format \"online\""],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","Friendlier progress bars"],["SE4RJYBZBNU6I3URBUMWP6T27CGGXLBEWWDB7WWX3W3AYSU6AFAAC","No pager on Windows (really not)"],["OIOMXESDNMLOTMNYCZZBYSBAQTYPAXXMUHTLA2AYCMNHZMPSLX2AC","Better error handling in HTTP"],["367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","Forwarding SSH stderr, and progress bar for push"],["C5XGFNKIX3RM6KOKRYTECBDDRDAE33JWIVJAJJTEFKFXQNXHEKHQC","Simplify return type for remote get_id"],["ZSFJT4SFIAS7WBODRZOFKKG4SVYBC5PC6XY75WYN7CCQ3SMV7IUQC","Allow remotes to have a different push and pull address"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["7HOBLRD43W2R5OVOYZVDO5LYPBZS7OSLDS7FH4NVNMBL3AZGMLSQC","Fixing remote push/pull"],["QDP3R3BG6HNETNP4ZZM2IGB6WRJKF5ZKE5SWZYMLK47ZDWFSLRFAC","Updating with the latest Sanakirja"],["6ZPDI7QGISBFIIJWV4J4JGCZKW2OZA57ZEQSP5YXWRFW3J6PGMVAC","pull uses None as the base case path when outputing repo"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["AETYXHGO4N5PURYZT7Z5UZDGLAN7CD6JESLFAASLYFEXZKWSFE7AC","Using an LruCache instead of a HashMap for loaded pages in a tag"],["5SCFAC4I7WQGP6WR3ZJFJ3CQCKX57FRVYKP3HPIJPIGJGDNTQJSAC","Fixing the unrecord of tags"],["C267PHOH3QJBSBEWQB3J7PPOOXIUKM3DIIZIPLHPU4D5OXRCGLZAC","Tags: dropping useless Hashes in favour of Merkles"],["BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","Format, versions, README"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","Fixing Windows compilation"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","remove unneccesary explicit lifetimes"],["X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","Do not download changes if we already have them"],["BVVMTOYWG4WSVWEYNW2XIG3D34Y7V54ACSSJPQ2AREOO7NGPMLDQC","Proper renaming of changes downloaded over HTTP"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["27RZYCM3XP72CW7FYGE373YAFD6EEZOZ4YAHEKV6JE5L6Z5N3JNAC","Pushing/pulling from/to Nest discussions again"],["PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","Upgrading to Clap 3.0.0-alpha.5"],["GLRGFBCWZYQEP6BG2IXYMXVZ5ETPWKNA2YJSIRHBCAAOAHJYT2YQC","Checking the version of less we have"],["44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","Do not output files introduced by patches that were not applied during a push"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["AF5AKUTO7AUAWFO5JS4W5BC5IG2F4EB4MGKYC5Q2CWJCVB65ZRYQC","Cleanup after the text changes refactoring"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["IQ4FCHPZYGTZHCQHUIRCMUI5LCHIDSJCM2AZXGRJARWLCPPLXZOQC","HTTP connections: pooling + retry on error"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","Fixing async issues in downloads"],["AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","Tags: completing the subcommand"],["L3RCAPPKPURGFWF4TKDVIJRRMPJDMQAZ6T5CITGMS7KP5ROZ7IWAC","Add --repository to tag commands"],["XSRTXUAS3DXJA42TZESMETFVTKU2OBUDGDE4N5F2CVWI4CLOUJ4AC","Pull: show progress bar when applying"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","push/pull: fixed \"changes\" arguments"],["BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","Completing dependencies only with changes the remote does not have"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","Locking stderr and the progress bar in SSH"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["VBMXB443FGZL6DLT6KAP2ICFCCQNXCUMDEUL67HB4CNKFMBBNSSAC","Retrying if the HTTP connection drops while reading the body"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","Cursors cleanup"],["ISCWVXO6UN37V2QMR75ZWS7H5E7WYZCGR6TX3EDFOFRVCAPMIVUAC","Progress bar for push"],["IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","Improved push/pull reporting"],["7ZROQSSN2M3LW6ASYMM6DPR5AERWV4K4TKWKEBKTCEJPMIJAHHXQC","Handling TAG uploads from the `pijul protocol` command"],["M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","Complete dependencies when pushing and pulling"],["FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","Forgot to add remote::http"],["AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","Write help for each argument"],["4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Fix some mistakes in the docs"],["FDEVV5NGUMTEULP25EFYFZEVICWYLGV7XMED25PNKD36DL4NA46AC","Tag check"],["RIAA2QKFQM2BIDU3KIUXI5VYIUKTIHD2BURROGY6UXNJ7KRPY4IQC","Making Merkle std::hash::Hash"]],"deps":["2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC","FGVTXN52IVYIDIBPFOOUE7QQAZMPJQRADGKXW3DENIC6EVS4AYFAC","3OW3YNZXF6DR2EI5XS7PDHUUZMARDU2JUJFJKIEWXQNSMCIBVAOQC","YD7QFAD7XC35U5N4DOS3B4MBJL4KWSHVEZ6OLO5RYXOUPFQNPQPAC","ILZ44DEYAPNWZRHHEML2GPNSMGP4QXXI4GCL4T24R7A4LKGRV23AC","JZADJIA3P3EOKPBGEKEXJVGWHNF2SIHYNNMB3XFNPBU4BTVGM3YQC","TA5VXGFGDBLENEH4SRHD7FOUXPXRKIHN7DIBUREW3DZHMDVJNNCAC","5MRZLKBHOFFUAJELWL34XILG2XVWPUEHOFPDXBK5ASCO6H26MBFAC","CQ3FIUY4HDRAI3EQWJ7D5VHLC4EBO2LHWVRHX56XA6LRGEKP63EAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","YS2HLPX6S3FCPI3Q7TVFP3XIZPK4JRKV6PFWRNZHCWWC2P2SDDLQC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","L5IUD2DSLEK4SYPF6PLNO7C3TZEFYFHNM42HGEHY5VWW5MHD7CXAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","WLUID7NANDWTN5GOECNEKFTLZF3MUVS7K26YWLYLSGJ56G63NV4QC","SE4RJYBZBNU6I3URBUMWP6T27CGGXLBEWWDB7WWX3W3AYSU6AFAAC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","UTEVDVGBBJZWMPQIM3NSSVN2GNBMY6I6FTAVXER7NMVBQSYKAVBAC","X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","FE5ES6Q46FMWYPNNNJLORY377QGDE57LBBDIVWDTC6Z7U4U73NEQC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","IQ4FCHPZYGTZHCQHUIRCMUI5LCHIDSJCM2AZXGRJARWLCPPLXZOQC","VBMXB443FGZL6DLT6KAP2ICFCCQNXCUMDEUL67HB4CNKFMBBNSSAC","BVVMTOYWG4WSVWEYNW2XIG3D34Y7V54ACSSJPQ2AREOO7NGPMLDQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","GLRGFBCWZYQEP6BG2IXYMXVZ5ETPWKNA2YJSIRHBCAAOAHJYT2YQC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","GYXIF25T2BCTCWCQI5DQOF3F4HBWDJUDJUMZ2WLHVBIOYATJTFAQC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","XSRTXUAS3DXJA42TZESMETFVTKU2OBUDGDE4N5F2CVWI4CLOUJ4AC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","AI73GKAO5QBPR6YGW7H5UNZYAEGYGIHAFO6DM2DWCPMVYLHE547QC","SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC","OIOMXESDNMLOTMNYCZZBYSBAQTYPAXXMUHTLA2AYCMNHZMPSLX2AC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","ISCWVXO6UN37V2QMR75ZWS7H5E7WYZCGR6TX3EDFOFRVCAPMIVUAC","2V33SO6IVPKBRPIJ3U3WYD6QKGN36BJVPP3M2YUDN7GTX3YH5UCAC","C5XGFNKIX3RM6KOKRYTECBDDRDAE33JWIVJAJJTEFKFXQNXHEKHQC","IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","3ZAS64J675LPNHM2X32RH45B4A2LGK7NAIFDGQBQLDDSZVWEBTIQC","K4CVMIUKNWBZ676IKSR5MYKTCDPPCRGWVAGYU772CE2B3AGAP4KQC","27RZYCM3XP72CW7FYGE373YAFD6EEZOZ4YAHEKV6JE5L6Z5N3JNAC","ZSFJT4SFIAS7WBODRZOFKKG4SVYBC5PC6XY75WYN7CCQ3SMV7IUQC","JLVRAJA5Z5DNBKHZDLT6QTKJ4LLJ547S4DH7X4A3XTB6234O5XDQC","7SQ7COLT73S6WT7H4ILJOQYRLYJVVYK4FWWCQ7TP6BVL5XMXMX3QC","7HOBLRD43W2R5OVOYZVDO5LYPBZS7OSLDS7FH4NVNMBL3AZGMLSQC","PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","QDP3R3BG6HNETNP4ZZM2IGB6WRJKF5ZKE5SWZYMLK47ZDWFSLRFAC","AF5AKUTO7AUAWFO5JS4W5BC5IG2F4EB4MGKYC5Q2CWJCVB65ZRYQC","6ZPDI7QGISBFIIJWV4J4JGCZKW2OZA57ZEQSP5YXWRFW3J6PGMVAC","L3RCAPPKPURGFWF4TKDVIJRRMPJDMQAZ6T5CITGMS7KP5ROZ7IWAC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","N3X5YP7PV2XVQKRRWSRCGJG34HZPLV4BGBLZGJG55KGIB7ORJ77QC","AETYXHGO4N5PURYZT7Z5UZDGLAN7CD6JESLFAASLYFEXZKWSFE7AC","C267PHOH3QJBSBEWQB3J7PPOOXIUKM3DIIZIPLHPU4D5OXRCGLZAC","7ZROQSSN2M3LW6ASYMM6DPR5AERWV4K4TKWKEBKTCEJPMIJAHHXQC","RM225IDQR36MNBMN7OT2R562M4FUD6L34RY7A3WDBBETZIIDKZ5AC","5SCFAC4I7WQGP6WR3ZJFJ3CQCKX57FRVYKP3HPIJPIGJGDNTQJSAC"]},"hunks":[{"Edit":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":19,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":62}],"down_context":[{"change":11,"pos":384}],"flag":"BLOCK","start":0,"end":23,"inode":{"change":11,"pos":25380}}},"contents":[{"Add":"use crate::remote::CS;"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":299,"ins":{"up_context":[{"change":11,"pos":255}],"down_context":[{"change":11,"pos":332}],"flag":"BLOCK","start":24,"end":109,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":255},"to":{"change":11,"start":255,"end":332},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" sender: Option>>,"}],"del_contents":[{"Del":" sender: Option>>,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":305,"ins":{"up_context":[{"change":11,"pos":353}],"down_context":[{"change":11,"pos":410}],"flag":"BLOCK","start":110,"end":165,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":353},"to":{"change":11,"start":353,"end":410},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" sender: Option>,"}],"del_contents":[{"Del":" sender: Option>,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":310,"ins":{"up_context":[{"change":11,"pos":29}],"down_context":[{"change":11,"pos":539}],"flag":"BLOCK","start":166,"end":191,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":29},"to":{"change":11,"start":492,"end":539},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":492},"to":{"change":11,"start":492,"end":539},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" hashes: Vec,"}],"del_contents":[{"Del":" hashes: Vec,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":456,"ins":{"up_context":[{"change":11,"pos":1995}],"down_context":[{"change":11,"pos":2117}],"flag":"BLOCK","start":192,"end":287,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1995},"to":{"change":11,"start":1995,"end":2117},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" if let (Some(n), Some(m), Some(m2)) = (s.next(), s.next(), s.next()) {"}],"del_contents":[{"Del":" debug!(\"s = {:?}\", s);\n if let (Some(n), Some(m)) = (s.next(), s.next()) {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":459,"ins":{"up_context":[{"change":11,"pos":2208}],"down_context":[{"change":11,"pos":2308}],"flag":"BLOCK","start":288,"end":583,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2208},"to":{"change":11,"start":2208,"end":2308},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" .send(Some(("},{"Add":" n,"},{"Add":" Merkle::from_base32(m.trim().as_bytes()).unwrap(),"},{"Add":" Merkle::from_base32(m2.trim().as_bytes()).unwrap(),"},{"Add":" )))"}],"del_contents":[{"Del":" .send(Some((n, Merkle::from_base32(m.trim().as_bytes()).unwrap())))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":512,"ins":{"up_context":[{"change":11,"pos":72}],"down_context":[{"change":11,"pos":0}],"flag":"BLOCK","start":584,"end":1918,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":72},"to":{"change":11,"start":72,"end":276},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":276},"to":{"change":11,"start":3706,"end":3847},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3706},"to":{"change":11,"start":3706,"end":3847},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3847},"to":{"change":11,"start":277,"end":556},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" match hashes[*current] {"},{"Add":" CS::Change(ref h) => {"},{"Add":" libpijul::changestore::filesystem::push_filename(final_path, h);"},{"Add":" debug!(\"moving {:?} to {:?}\", path, final_path);"},{"Add":" std::fs::create_dir_all(&final_path.parent().unwrap())?;"},{"Add":" let r = std::fs::rename(&path, &final_path);"},{"Add":" libpijul::changestore::filesystem::pop_filename(final_path);"},{"Add":" r?;"},{"Add":" }"},{"Add":" CS::State(h) => {"},{"Add":" libpijul::changestore::filesystem::push_tag_filename("},{"Add":" final_path, &h,"},{"Add":" );"},{"Add":" debug!(\"moving {:?} to {:?}\", path, final_path);"},{"Add":" std::fs::create_dir_all(&final_path.parent().unwrap())?;"},{"Add":" let r = std::fs::rename(&path, &final_path);"},{"Add":" libpijul::changestore::filesystem::pop_filename(final_path);"},{"Add":" r?;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" libpijul::changestore::filesystem::push_filename(\n final_path,\n &hashes[*current],\n );\n"},{"Del":" final_path.set_extension(\"change\");\n debug!(\"moving {:?} to {:?}\", path, final_path);\n"},{"Del":" std::fs::create_dir_all(&final_path.parent().unwrap())?;\n let r = std::fs::rename(&path, &final_path);\n libpijul::changestore::filesystem::pop_filename(final_path);\n r?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":737,"ins":{"up_context":[{"change":11,"pos":36194}],"down_context":[{"change":11,"pos":7760}],"flag":"BLOCK","start":1919,"end":1983,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":36194},"to":{"change":11,"start":36194,"end":36250},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" ) -> Result, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":889,"ins":{"up_context":[{"change":11,"pos":528}],"down_context":[{"change":11,"pos":659}],"flag":"BLOCK","start":1984,"end":2065,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":528},"to":{"change":11,"start":91,"end":184},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" super::ListLine::Change { n, h, m, tag } => f(a, n, h, m, tag)?,"}],"del_contents":[{"Del":" super::ListLine::Change { n, h, m, is_tagged } => f(a, n, h, m, is_tagged)?,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":910,"ins":{"up_context":[{"change":11,"pos":44434}],"down_context":[{"change":11,"pos":44460}],"flag":"BLOCK","start":2066,"end":2090,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":44434},"to":{"change":11,"start":44434,"end":44460},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" changes: &[CS],"}],"del_contents":[{"Del":" changes: &[Hash],\n"}]}},{"Edit":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":916,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":31},"to":{"change":11,"start":44594,"end":44796},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":44594},"to":{"change":11,"start":44594,"end":44796},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":44796},"to":{"change":11,"start":0,"end":82},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":82},"to":{"change":11,"start":44880,"end":44965},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":44880},"to":{"change":11,"start":44880,"end":44965},"introduced_by":11}],"inode":{"change":11,"pos":25380}}},"contents":[{"Del":" libpijul::changestore::filesystem::push_filename(&mut local, &c);\n let mut change_file = std::fs::File::open(&local)?;\n let change_len = change_file.metadata()?.len();\n"},{"Del":" let mut change = thrussh::CryptoVec::new_zeroed(change_len as usize);\n"},{"Del":" use std::io::Read;\n change_file.read_exact(&mut change[..])?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":921,"ins":{"up_context":[{"change":11,"pos":45116}],"down_context":[{"change":11,"pos":23}],"flag":"BLOCK","start":2091,"end":3688,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":45116},"to":{"change":11,"start":45116,"end":45306},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":499},"to":{"change":11,"start":45306,"end":45379},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":633},"to":{"change":11,"start":45306,"end":45379},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":45306},"to":{"change":11,"start":45306,"end":45379},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" match c {"},{"Add":" CS::Change(c) => {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut local, &c);"},{"Add":" let mut change_file = std::fs::File::open(&local)?;"},{"Add":" let change_len = change_file.metadata()?.len();"},{"Add":" let mut change = thrussh::CryptoVec::new_zeroed(change_len as usize);"},{"Add":" use std::io::Read;"},{"Add":" change_file.read_exact(&mut change[..])?;"},{"Add":" self.c"},{"Add":" .data("},{"Add":" format!(\"apply {} {} {}\\n\", to_channel, c.to_base32(), change_len)"},{"Add":" .as_bytes(),"},{"Add":" )"},{"Add":" .await?;"},{"Add":" self.c.data(&change[..]).await?;"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut local);"},{"Add":" }"},{"Add":" CS::State(c) => {"},{"Add":" libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);"},{"Add":" let mut tag_file = libpijul::tag::OpenTagFile::open(&local, &c)?;"},{"Add":" let mut v = Vec::new();"},{"Add":" tag_file.short(&mut v)?;"},{"Add":" self.c"},{"Add":" .data("},{"Add":" format!(\"tagup {} {} {}\\n\", c.to_base32(), to_channel, v.len())"},{"Add":" .as_bytes(),"},{"Add":" )"},{"Add":" .await?;"},{"Add":" self.c.data(&v[..]).await?;"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut local);"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" self.c\n .data(format!(\"apply {} {} {}\\n\", to_channel, c.to_base32(), change_len).as_bytes())\n .await?;\n self.c.data(&change[..]).await?;\n"},{"Del":" libpijul::changestore::filesystem::pop_filename(&mut local);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":961,"ins":{"up_context":[{"change":11,"pos":22}],"down_context":[{"change":11,"pos":8820}],"flag":"BLOCK","start":3689,"end":3799,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":22},"to":{"change":11,"start":143,"end":223},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":143},"to":{"change":11,"start":143,"end":223},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":223},"to":{"change":11,"start":8746,"end":8820},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":536},"to":{"change":11,"start":8746,"end":8820},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":8746},"to":{"change":11,"start":8746,"end":8820},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" c: &mut tokio::sync::mpsc::UnboundedReceiver,"},{"Add":" sender: &mut tokio::sync::mpsc::Sender,"}],"del_contents":[{"Del":" c: &mut tokio::sync::mpsc::UnboundedReceiver,\n"},{"Del":" sender: &mut tokio::sync::mpsc::Sender,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":973,"ins":{"up_context":[{"change":11,"pos":120}],"down_context":[{"change":11,"pos":334}],"flag":"BLOCK","start":3800,"end":3918,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":120},"to":{"change":11,"start":374,"end":536},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":374},"to":{"change":11,"start":374,"end":536},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" c: &mut tokio::sync::mpsc::UnboundedReceiver,"},{"Add":" sender: Option<&mut tokio::sync::mpsc::Sender>,"}],"del_contents":[{"Del":" c: &mut tokio::sync::mpsc::UnboundedReceiver,\n sender: Option<&mut tokio::sync::mpsc::Sender>,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":1010,"ins":{"up_context":[{"change":11,"pos":1197}],"down_context":[{"change":11,"pos":1443}],"flag":"BLOCK","start":3919,"end":4525,"inode":{"change":11,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1197},"to":{"change":11,"start":1197,"end":1497},"introduced_by":11}],"inode":{"change":11,"pos":25380}},"ins_contents":[{"Add":" match h {"},{"Add":" CS::Change(h) if full => {"},{"Add":" self.c"},{"Add":" .data(format!(\"change {}\\n\", h.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" }"},{"Add":" CS::Change(h) => {"},{"Add":" self.c"},{"Add":" .data(format!(\"partial {}\\n\", h.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" }"},{"Add":" CS::State(h) => {"},{"Add":" self.c"},{"Add":" .data(format!(\"tag {}\\n\", h.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" }"}],"del_contents":[{"Del":" if full {\n self.c\n .data(format!(\"change {}\\n\", h.to_base32()).as_bytes())\n .await?;\n } else {\n self.c\n .data(format!(\"partial {}\\n\", h.to_base32()).as_bytes())\n .await?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":35,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":52848}],"down_context":[{"change":11,"pos":52848}],"flag":"BLOCK","start":4526,"end":4631,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]"},{"Add":"pub enum CS {"},{"Add":" Change(Hash),"},{"Add":" State(Merkle),"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":167,"ins":{"up_context":[{"change":5,"pos":30}],"down_context":[{"change":11,"pos":1449}],"flag":"BLOCK","start":4632,"end":4733,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":30},"to":{"change":11,"start":1300,"end":1330},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1300},"to":{"change":11,"start":1300,"end":1330},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1372},"to":{"change":11,"start":1372,"end":1449},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" pub to_upload: Vec,"},{"Add":" pub remote_unrecs: Vec<(u64, CS)>,"},{"Add":" pub unknown_changes: Vec,"}],"del_contents":[{"Del":" pub to_upload: Vec,\n"},{"Del":" pub remote_unrecs: Vec<(u64, Hash)>,\n pub unknown_changes: Vec,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":195,"ins":{"up_context":[{"change":11,"pos":2895}],"down_context":[{"change":11,"pos":2927}],"flag":"BLOCK","start":4734,"end":4764,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2895},"to":{"change":11,"start":2895,"end":2927},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2927},"to":{"change":11,"start":185,"end":216},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" pub to_download: Vec,"}],"del_contents":[{"Del":" pub to_download: Vec,\n"},{"Del":" pub tags: HashSet,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":197,"ins":{"up_context":[{"change":11,"pos":2969}],"down_context":[{"change":11,"pos":3063}],"flag":"BLOCK","start":4765,"end":4855,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2969},"to":{"change":11,"start":2969,"end":3063},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" pub ours_ge_dichotomy_set: HashSet,"},{"Add":" pub theirs_ge_dichotomy_set: HashSet,"}],"del_contents":[{"Del":" pub ours_ge_dichotomy_set: HashSet,\n pub theirs_ge_dichotomy_set: HashSet,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":202,"ins":{"up_context":[{"change":11,"pos":278}],"down_context":[{"change":11,"pos":3291}],"flag":"BLOCK","start":4856,"end":4895,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":278},"to":{"change":11,"start":3250,"end":3291},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3250},"to":{"change":11,"start":3250,"end":3291},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" pub remote_unrecs: Vec<(u64, CS)>,"}],"del_contents":[{"Del":" pub remote_unrecs: Vec<(u64, Hash)>,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":216,"ins":{"up_context":[{"change":5,"pos":75}],"down_context":[{"change":11,"pos":3749}],"flag":"BLOCK","start":4896,"end":4936,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":75},"to":{"change":11,"start":3701,"end":3749},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3701},"to":{"change":11,"start":3701,"end":3749},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let mut to_upload = Vec::new();"}],"del_contents":[{"Del":" let mut to_upload = Vec::::new();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":226,"ins":{"up_context":[{"change":11,"pos":4209}],"down_context":[{"change":11,"pos":4258}],"flag":"BLOCK","start":4937,"end":4998,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4209},"to":{"change":11,"start":4209,"end":4258},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" to_upload.push(CS::Change(h.into()))"}],"del_contents":[{"Del":" to_upload.push(h.into())\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":230,"ins":{"up_context":[{"change":11,"pos":4418}],"down_context":[{"change":11,"pos":4476}],"flag":"BLOCK","start":4999,"end":5069,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4418},"to":{"change":11,"start":4418,"end":4476},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" to_upload.push(CS::Change(h.into()));"}],"del_contents":[{"Del":" to_upload.push(h.into());\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":258,"ins":{"up_context":[{"change":5,"pos":120}],"down_context":[{"change":11,"pos":5420}],"flag":"BLOCK","start":5070,"end":5110,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":120},"to":{"change":11,"start":5372,"end":5420},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":5372},"to":{"change":11,"start":5372,"end":5420},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let mut to_upload = Vec::new();"}],"del_contents":[{"Del":" let mut to_upload = Vec::::new();\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":261,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":5542}],"down_context":[{"change":11,"pos":5542}],"flag":"BLOCK","start":5111,"end":6061,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" let mut tags: HashSet = HashSet::new();"},{"Add":" for x in txn.rev_iter_tags(&channel.read().tags, None)? {"},{"Add":" let (n, m) = x?;"},{"Add":" debug!(\"rev_iter_tags {:?} {:?}\", n, m);"},{"Add":" // First, if the remote has exactly the same first n tags, break."},{"Add":" if let Some((_, p)) = txn.get_remote_tag(&remote_ref.lock().tags, (*n).into())? {"},{"Add":" if p.b == m.b {"},{"Add":" debug!(\"the remote has tag {:?}\", p.a);"},{"Add":" break;"},{"Add":" }"},{"Add":" if p.a != m.a {"},{"Add":" // What to do here? It is possible that state"},{"Add":" // `n` is a different state than `m.a` in the"},{"Add":" // remote, and is also tagged."},{"Add":" }"},{"Add":" } else {"},{"Add":" tags.insert(m.a.into());"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"tags = {:?}\", tags);"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":283,"ins":{"up_context":[{"change":11,"pos":5644}],"down_context":[{"change":11,"pos":5730}],"flag":"BLOCK","start":6062,"end":6452,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":5644},"to":{"change":11,"start":5644,"end":5730},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let h_unrecorded = self"},{"Add":" .remote_unrecs"},{"Add":" .iter()"},{"Add":" .any(|(_, hh)| hh == &CS::Change(h.into()));"},{"Add":" if !h_unrecorded {"},{"Add":" if txn.remote_has_state(remote_ref, &m)?.is_some() {"},{"Add":" debug!(\"remote_has_state: {:?}\", m);"},{"Add":" break;"},{"Add":" }"}],"del_contents":[{"Del":" if txn.remote_has_state(remote_ref, &m)? {\n break;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":298,"ins":{"up_context":[{"change":11,"pos":6075}],"down_context":[{"change":11,"pos":6206}],"flag":"BLOCK","start":6453,"end":6614,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6075},"to":{"change":11,"start":6075,"end":6134},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6134},"to":{"change":11,"start":6134,"end":6206},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if (!txn.remote_has_change(remote_ref, &h)? || h_unrecorded)"},{"Add":" && !self.theirs_ge_dichotomy_set.contains(&CS::Change(h_deser))"}],"del_contents":[{"Del":" if !txn.remote_has_change(remote_ref, &h)?\n"},{"Del":" && !self.theirs_ge_dichotomy_set.contains(&h_deser)\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":302,"ins":{"up_context":[{"change":11,"pos":6267}],"down_context":[{"change":11,"pos":6315}],"flag":"BLOCK","start":6615,"end":6819,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6267},"to":{"change":11,"start":6267,"end":6315},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if tags.remove(&m.into()) {"},{"Add":" to_upload.push(CS::State(m.into()));"},{"Add":" }"},{"Add":" to_upload.push(CS::Change(h_deser));"}],"del_contents":[{"Del":" to_upload.push(h_deser)\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":309,"ins":{"up_context":[{"change":11,"pos":6475}],"down_context":[{"change":11,"pos":6532}],"flag":"BLOCK","start":6820,"end":7056,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6475},"to":{"change":11,"start":6475,"end":6532},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" to_upload.push(CS::Change(h_deser));"},{"Add":" if tags.remove(&m.into()) {"},{"Add":" to_upload.push(CS::State(m.into()));"},{"Add":" }"}],"del_contents":[{"Del":" to_upload.push(h_deser);\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":317,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":6649}],"down_context":[{"change":11,"pos":6649}],"flag":"BLOCK","start":7057,"end":7445,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" }"},{"Add":" }"},{"Add":" for t in tags.iter() {"},{"Add":" if let Some(n) = txn.remote_has_state(&remote_ref, &t.into())? {"},{"Add":" if !txn.is_tagged(&remote_ref.lock().tags, n)? {"},{"Add":" to_upload.push(CS::State(*t));"},{"Add":" }"},{"Add":" } else {"},{"Add":" debug!(\"the remote doesn't have state {:?}\", t);"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":333,"ins":{"up_context":[{"change":11,"pos":6896}],"down_context":[{"change":11,"pos":132}],"flag":"BLOCK","start":7446,"end":8008,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6896},"to":{"change":11,"start":6896,"end":6984},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6984},"to":{"change":11,"start":279,"end":320},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":320},"to":{"change":11,"start":0,"end":132},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":7022},"to":{"change":11,"start":0,"end":132},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let mut unknown_changes = Vec::new();"},{"Add":" for (_, h, m, is_tag) in self.theirs_ge_dichotomy.iter() {"},{"Add":" let h_is_known = txn.get_revchanges(&channel, h).unwrap().is_some();"},{"Add":" let change = CS::Change(*h);"},{"Add":" if !(self.ours_ge_dichotomy_set.contains(&change) || h_is_known) {"},{"Add":" unknown_changes.push(change)"},{"Add":" }"},{"Add":" if *is_tag {"},{"Add":" let m_is_known = if let Some(n) = txn"},{"Add":" .channel_has_state(txn.states(&*channel.read()), &m.into())"},{"Add":" .unwrap()"}],"del_contents":[{"Del":" let unknown_changes = self\n .theirs_ge_dichotomy\n .iter()\n"},{"Del":" .filter_map(|(_, h, _, _)| {\n"},{"Del":" if self.ours_ge_dichotomy_set.contains(h)\n || txn.get_revchanges(&channel, h).unwrap().is_some()\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":345,"ins":{"up_context":[{"change":11,"pos":150}],"down_context":[{"change":11,"pos":7107}],"flag":"BLOCK","start":8009,"end":8090,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":150},"to":{"change":11,"start":7082,"end":7107},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":7082},"to":{"change":11,"start":7082,"end":7107},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" txn.is_tagged(txn.tags(&*channel.read()), n.into()).unwrap()"}],"del_contents":[{"Del":" None\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":347,"ins":{"up_context":[{"change":11,"pos":7132}],"down_context":[{"change":11,"pos":7161}],"flag":"BLOCK","start":8091,"end":8225,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":7132},"to":{"change":11,"start":7132,"end":7161},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" false"},{"Add":" };"},{"Add":" if !m_is_known {"},{"Add":" unknown_changes.push(CS::State(*m))"}],"del_contents":[{"Del":" Some(*h)\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":352,"ins":{"up_context":[{"change":11,"pos":7179}],"down_context":[{"change":11,"pos":7231}],"flag":"BLOCK","start":8226,"end":8250,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":7179},"to":{"change":11,"start":7179,"end":7194},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":7194},"to":{"change":11,"start":7194,"end":7231},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" })\n"},{"Del":" .collect::>();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":379,"ins":{"up_context":[{"change":11,"pos":316}],"down_context":[{"change":11,"pos":352}],"flag":"BLOCK","start":8251,"end":8300,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":316},"to":{"change":11,"start":321,"end":358},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" to_download.push(CS::Change(h));"}],"del_contents":[{"Del":" to_download.push(h);\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":385,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":402},"to":{"change":11,"start":359,"end":393},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" tags: HashSet::new(),\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":399,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":8828},"to":{"change":11,"start":394,"end":433},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" let mut tags = HashSet::new();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":402,"ins":{"up_context":[{"change":11,"pos":9021}],"down_context":[{"change":11,"pos":9056}],"flag":"BLOCK","start":8301,"end":8339,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":9021},"to":{"change":11,"start":434,"end":472},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let (_, (h, m)) = x?;"}],"del_contents":[{"Del":" let (n, (h, m)) = x?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":421,"ins":{"up_context":[{"change":11,"pos":9776}],"down_context":[{"change":11,"pos":9827}],"flag":"BLOCK","start":8340,"end":8404,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":9776},"to":{"change":11,"start":473,"end":671},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" to_download.push(CS::Change(h.into()));"}],"del_contents":[{"Del":" to_download.push(h.into());\n if txn.is_tagged(&remote_channel.tags, n)? {\n tags.insert(m.into());\n }\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":429,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":9961},"to":{"change":11,"start":672,"end":690},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" tags,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":505,"ins":{"up_context":[{"change":11,"pos":165}],"down_context":[{"change":11,"pos":57093}],"flag":"BLOCK","start":8405,"end":8476,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":165},"to":{"change":11,"start":43,"end":43},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":43},"to":{"change":11,"start":56987,"end":57008},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":165},"to":{"change":11,"start":56987,"end":57008},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":6499},"to":{"change":11,"start":56987,"end":57008},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56987},"to":{"change":11,"start":56987,"end":57008},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57008},"to":{"change":11,"start":269,"end":331},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":331},"to":{"change":11,"start":57072,"end":57093},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":567},"to":{"change":11,"start":57072,"end":57093},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57072},"to":{"change":11,"start":57072,"end":57093},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let n = self.dichotomy_changelist(txn, &remote.lock()).await?;"}],"del_contents":[{"Del":""},{"Del":" let n = self\n"},{"Del":" .dichotomy_changelist(txn, &remote.lock().remote)\n"},{"Del":" .await?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":522,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":57419}],"down_context":[{"change":11,"pos":57419}],"flag":"BLOCK","start":8477,"end":8966,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" }"},{"Add":" let v: Vec<_> = txn"},{"Add":" .iter_tags(&remote.lock().tags, n)?"},{"Add":" .filter_map(|k| {"},{"Add":" debug!(\"filter_map {:?}\", k);"},{"Add":" let k = (*k.unwrap().0).into();"},{"Add":" if k >= n {"},{"Add":" Some(k)"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" })"},{"Add":" .collect();"},{"Add":" for k in v {"},{"Add":" debug!(\"deleting {:?}\", k);"},{"Add":" txn.del_tags(&mut remote.lock().tags, k)?;"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":539,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":57429}],"down_context":[{"change":11,"pos":7225}],"flag":"BLOCK","start":8967,"end":8968,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":543,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":1102}],"down_context":[{"change":11,"pos":57516}],"flag":"BLOCK","start":8969,"end":10405,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" async fn update_changelist_pushpull_from_scratch("},{"Add":" &mut self,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" path: &[String],"},{"Add":" current_channel: &ChannelRef>,"},{"Add":" ) -> Result>, anyhow::Error> {"},{"Add":" debug!(\"no id, starting from scratch\");"},{"Add":" let (inodes, theirs_ge_dichotomy) = self.download_changelist_nocache(0, path).await?;"},{"Add":" let mut theirs_ge_dichotomy_set = HashSet::new();"},{"Add":" let mut to_download = Vec::new();"},{"Add":" for (_, h, m, is_tag) in theirs_ge_dichotomy.iter() {"},{"Add":" theirs_ge_dichotomy_set.insert(CS::Change(*h));"},{"Add":" if txn.get_revchanges(current_channel, h)?.is_none() {"},{"Add":" to_download.push(CS::Change(*h));"},{"Add":" }"},{"Add":" if *is_tag {"},{"Add":" let ch = current_channel.read();"},{"Add":" if let Some(n) = txn.channel_has_state(txn.states(&*ch), &m.into())? {"},{"Add":" if !txn.is_tagged(txn.tags(&*ch), n.into())? {"},{"Add":" to_download.push(CS::State(*m));"},{"Add":" }"},{"Add":" } else {"},{"Add":" to_download.push(CS::State(*m));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(RemoteDelta {"},{"Add":" inodes,"},{"Add":" remote_ref: None,"},{"Add":" to_download,"},{"Add":" ours_ge_dichotomy_set: HashSet::new(),"},{"Add":" theirs_ge_dichotomy,"},{"Add":" theirs_ge_dichotomy_set,"},{"Add":" remote_unrecs: Vec::new(),"},{"Add":" })"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":602,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":11077}],"down_context":[{"change":11,"pos":11077}],"flag":"BLOCK","start":10406,"end":10428,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" is_tag: bool,"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":620,"ins":{"up_context":[{"change":11,"pos":357}],"down_context":[{"change":11,"pos":11668}],"flag":"BLOCK","start":10429,"end":10562,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":357},"to":{"change":11,"start":488,"end":540},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":540},"to":{"change":11,"start":357,"end":455},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":357},"to":{"change":11,"start":357,"end":455},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":455},"to":{"change":11,"start":455,"end":563},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":563},"to":{"change":11,"start":691,"end":803},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":803},"to":{"change":11,"start":621,"end":673},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":621},"to":{"change":11,"start":621,"end":673},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":673},"to":{"change":11,"start":541,"end":654},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":654},"to":{"change":11,"start":804,"end":881},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":881},"to":{"change":11,"start":881,"end":903},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":903},"to":{"change":11,"start":654,"end":672},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":654},"to":{"change":11,"start":654,"end":672},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":672},"to":{"change":11,"start":711,"end":848},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":711},"to":{"change":11,"start":711,"end":848},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":848},"to":{"change":11,"start":904,"end":926},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":926},"to":{"change":11,"start":848,"end":1051},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":848},"to":{"change":11,"start":848,"end":1051},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":86},"to":{"change":11,"start":11504,"end":11668},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1051},"to":{"change":11,"start":11504,"end":11668},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11504},"to":{"change":11,"start":11504,"end":11668},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" return self"},{"Add":" .update_changelist_pushpull_from_scratch(txn, path, current_channel)"},{"Add":" .await;"}],"del_contents":[{"Del":" debug!(\"no id, starting from scratch\");\n"},{"Del":" let (inodes, theirs_ge_dichotomy) = self.download_changelist_nocache(0, path).await?;\n"},{"Del":" let mut theirs_ge_dichotomy_set = HashSet::new();\n let mut to_download = Vec::new();\n"},{"Del":" let mut tags = HashSet::new();\n for (_, h, m, is_tagged) in theirs_ge_dichotomy.iter() {\n"},{"Del":" theirs_ge_dichotomy_set.insert(*h);\n"},{"Del":" if txn.get_revchanges(current_channel, h)?.is_none() {\n to_download.push(*h);\n"},{"Del":" if *is_tagged {\n tags.insert(*m);\n"},{"Del":" }\n"},{"Del":" }\n"},{"Del":" }\n return Ok(RemoteDelta {\n inodes,\n remote_ref: None,\n to_download,\n"},{"Del":" tags,\n"},{"Del":" ours_ge_dichotomy_set: HashSet::new(),\n theirs_ge_dichotomy,\n theirs_ge_dichotomy_set,\n remote_unrecs: Vec::new(),\n });\n };\n"},{"Del":" let mut remote_ref = if let Some(name) = self.name() {\n txn.open_or_create_remote(id, name).unwrap()\n } else {\n unreachable!()\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":624,"ins":{"up_context":[{"change":11,"pos":11679}],"down_context":[{"change":11,"pos":11851}],"flag":"BLOCK","start":10563,"end":10791,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11679},"to":{"change":11,"start":11679,"end":11710},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11710},"to":{"change":11,"start":11710,"end":11776},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11776},"to":{"change":11,"start":11776,"end":11797},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11797},"to":{"change":11,"start":11797,"end":11851},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let mut remote_ref = txn.open_or_create_remote(id, self.name().unwrap()).unwrap();"},{"Add":" let dichotomy_n = self.dichotomy_changelist(txn, &remote_ref.lock()).await?;"},{"Add":" let ours_ge_dichotomy: Vec<(u64, CS)> = txn"}],"del_contents":[{"Del":" let dichotomy_n = self\n"},{"Del":" .dichotomy_changelist(txn, &remote_ref.lock().remote)\n"},{"Del":" .await?;\n"},{"Del":" let ours_ge_dichotomy: Vec<(u64, Hash)> = txn\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":634,"ins":{"up_context":[{"change":11,"pos":12221}],"down_context":[{"change":11,"pos":12265}],"flag":"BLOCK","start":10792,"end":10848,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12221},"to":{"change":11,"start":12221,"end":12265},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" Some((k, CS::Change(hash)))"}],"del_contents":[{"Del":" Some((k, hash))\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":644,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":12552}],"down_context":[{"change":11,"pos":12552}],"flag":"BLOCK","start":10849,"end":10916,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" debug!(\"theirs_ge_dichotomy = {:?}\", theirs_ge_dichotomy);"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":648,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12655},"to":{"change":11,"start":12655,"end":12677},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12677},"to":{"change":11,"start":12677,"end":12718},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12718},"to":{"change":11,"start":12718,"end":12796},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12796},"to":{"change":11,"start":927,"end":962},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" .copied()\n"},{"Del":" .collect::>();\n"},{"Del":" let theirs_ge_dichotomy_set = theirs_ge_dichotomy\n .iter()\n"},{"Del":" .map(|(_, h, _, _)| h)\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":649,"ins":{"up_context":[{"change":11,"pos":12850}],"down_context":[{"change":11,"pos":13503}],"flag":"BLOCK","start":10917,"end":11224,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12850},"to":{"change":11,"start":12850,"end":12891},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12891},"to":{"change":11,"start":12891,"end":13257},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13257},"to":{"change":11,"start":13257,"end":13434},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13434},"to":{"change":11,"start":13434,"end":13455},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13455},"to":{"change":11,"start":13455,"end":13503},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" .collect::>();"},{"Add":" let mut theirs_ge_dichotomy_set = HashSet::new();"},{"Add":" for (_, h, m, is_tag) in theirs_ge_dichotomy.iter() {"},{"Add":" theirs_ge_dichotomy_set.insert(CS::Change(*h));"},{"Add":" if *is_tag {"},{"Add":" theirs_ge_dichotomy_set.insert(CS::State(*m));"}],"del_contents":[{"Del":" .collect::>();\n"},{"Del":"\n // remote_unrecs = {x: (u64, Hash) | x \\in ours_ge_dichot /\\ ~(x \\in theirs_ge_dichot) /\\ x \\in current_channel }\n let mut remote_unrecs = Vec::new();\n for (n, hash) in &ours_ge_dichotomy {\n if theirs_ge_dichotomy_set.contains(hash) {\n // If this change is still present in the remote, skip\n continue;\n"},{"Del":" } else if txn.get_revchanges(¤t_channel, &hash)?.is_none() {\n // If this unrecord wasn't in our current channel, skip\n continue;\n"},{"Del":" } else {\n"},{"Del":" remote_unrecs.push((*n, *hash))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":657,"ins":{"up_context":[{"change":11,"pos":13527}],"down_context":[{"change":11,"pos":13611}],"flag":"BLOCK","start":11225,"end":11787,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13527},"to":{"change":11,"start":13527,"end":13611},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" // remote_unrecs = {x: (u64, Hash) | x \\in ours_ge_dichot /\\ ~(x \\in theirs_ge_dichot) /\\ x \\in current_channel }"},{"Add":" let remote_unrecs = remote_unrecs("},{"Add":" txn,"},{"Add":" current_channel,"},{"Add":" &ours_ge_dichotomy,"},{"Add":" &theirs_ge_dichotomy_set,"},{"Add":" )?;"},{"Add":" let should_cache = if let Some(true) = force_cache {"},{"Add":" true"},{"Add":" } else {"},{"Add":" remote_unrecs.is_empty()"},{"Add":" };"},{"Add":" debug!("},{"Add":" \"should_cache = {:?} {:?} {:?}\","},{"Add":" force_cache, remote_unrecs, should_cache"},{"Add":" );"}],"del_contents":[{"Del":" let should_cache = force_cache.unwrap_or_else(|| remote_unrecs.is_empty());\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":675,"ins":{"up_context":[{"change":11,"pos":13637}],"down_context":[{"change":11,"pos":13752}],"flag":"BLOCK","start":11788,"end":12141,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13637},"to":{"change":11,"start":13637,"end":13699},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13699},"to":{"change":11,"start":13699,"end":13752},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" use libpijul::ChannelMutTxnT;"},{"Add":" for (k, t) in ours_ge_dichotomy.iter().copied() {"},{"Add":" match t {"},{"Add":" CS::State(_) => txn.del_tags(&mut remote_ref.lock().tags, k)?,"},{"Add":" CS::Change(_) => {"},{"Add":" txn.del_remote(&mut remote_ref, k)?;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" for (k, _) in ours_ge_dichotomy.iter().copied() {\n"},{"Del":" txn.del_remote(&mut remote_ref, k)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":684,"ins":{"up_context":[{"change":11,"pos":13766}],"down_context":[{"change":11,"pos":13894}],"flag":"BLOCK","start":12142,"end":12454,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13766},"to":{"change":11,"start":963,"end":1097},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" for (n, h, m, is_tag) in theirs_ge_dichotomy.iter().copied() {"},{"Add":" debug!(\"theirs: {:?} {:?} {:?}\", n, h, m);"},{"Add":" txn.put_remote(&mut remote_ref, n, (h, m))?;"},{"Add":" if is_tag {"},{"Add":" txn.put_tags(&mut remote_ref.lock().tags, n, &m)?;"},{"Add":" }"}],"del_contents":[{"Del":" for (n, h, m, t) in theirs_ge_dichotomy.iter().copied() {\n txn.put_remote(&mut remote_ref, n, (h, m, t))?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":692,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13918},"to":{"change":11,"start":13918,"end":14140},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14140},"to":{"change":11,"start":14140,"end":14255},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14255},"to":{"change":11,"start":14255,"end":14281},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14281},"to":{"change":11,"start":14281,"end":14308},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14308},"to":{"change":11,"start":14308,"end":14319},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":14319},"to":{"change":11,"start":57522,"end":57523},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57522},"to":{"change":11,"start":57522,"end":57523},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57523},"to":{"change":11,"start":14320,"end":14811},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" let state_cond = |txn: &MutTxn<()>, merkle: &libpijul::pristine::SerializedMerkle| {\n txn.channel_has_state(txn.states(&*current_channel.read()), merkle)\n .map(|x| x.is_some())\n };\n"},{"Del":" let change_cond = |txn: &MutTxn<()>, hash: &Hash| {\n txn.get_revchanges(¤t_channel, hash)\n"},{"Del":" .unwrap()\n"},{"Del":" .is_none()\n"},{"Del":" };\n"},{"Del":"\n"},{"Del":" // IF:\n // The user only wanted to push/pull specific changes\n // ELIF:\n // The user specified no changes and there were no remote unrecords\n // effecting the current channel means we can auto-cache\n // the local remote cache\n // ELSE:\n // The user specified no changes but there were remote unrecords\n // effecting the current channel meaning we can't auto-cache\n // the local remote cache.\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":693,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":14853}],"down_context":[{"change":11,"pos":14853}],"flag":"BLOCK","start":12455,"end":12527,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" // Here, the user only wanted to push/pull specific changes"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":696,"ins":{"up_context":[{"change":11,"pos":14924}],"down_context":[{"change":11,"pos":14981}],"flag":"BLOCK","start":12528,"end":12872,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14924},"to":{"change":11,"start":14924,"end":14981},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" .map(|h| {"},{"Add":" if is_tag {"},{"Add":" Ok(CS::State("},{"Add":" txn.state_from_prefix(&*current_channel.read(), h)?.0,"},{"Add":" ))"},{"Add":" } else {"},{"Add":" Ok(CS::Change(txn.hash_from_prefix(h)?.0))"},{"Add":" }"},{"Add":" })"}],"del_contents":[{"Del":" .map(|h| Ok(txn.hash_from_prefix(h)?.0))\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":710,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15184},"to":{"change":11,"start":1098,"end":1136},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" tags: HashSet::new(),\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":715,"ins":{"up_context":[{"change":11,"pos":15347}],"down_context":[{"change":11,"pos":1745}],"flag":"BLOCK","start":12873,"end":13353,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15347},"to":{"change":11,"start":15347,"end":15380},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15380},"to":{"change":11,"start":15380,"end":15437},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15437},"to":{"change":11,"start":1137,"end":1180},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1180},"to":{"change":11,"start":1180,"end":1239},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1239},"to":{"change":11,"start":1239,"end":1719},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1719},"to":{"change":11,"start":1719,"end":1745},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" } else {"},{"Add":" let mut to_download: Vec = Vec::new();"},{"Add":" for (n, h, m, is_tag) in theirs_ge_dichotomy.iter() {"},{"Add":" // In all cases, add this new change/state/tag to `to_download`."},{"Add":" let ch = CS::Change(*h);"},{"Add":" if txn.get_revchanges(¤t_channel, h).unwrap().is_none() {"},{"Add":" to_download.push(ch.clone());"},{"Add":" if *is_tag {"},{"Add":" to_download.push(CS::State(*m));"}],"del_contents":[{"Del":" } else if should_cache {\n"},{"Del":" let mut to_download: Vec = Vec::new();\n"},{"Del":" let mut tags = HashSet::new();\n"},{"Del":" {\n let rem = remote_ref.lock();\n"},{"Del":" for thing in txn.iter_remote(&rem.remote, 0)? {\n let (n, libpijul::pristine::Pair { a: hash, b: merkle }) = thing?;\n if state_cond(txn, &merkle)? {\n break;\n } else if change_cond(txn, &hash.into()) {\n to_download.push(Hash::from(hash));\n if txn.is_tagged(&rem.tags, (*n).into())? {\n tags.insert(merkle.into());\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":725,"ins":{"up_context":[{"change":11,"pos":1767}],"down_context":[{"change":11,"pos":16595}],"flag":"BLOCK","start":13354,"end":13815,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":1767},"to":{"change":11,"start":15783,"end":15815},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15783},"to":{"change":11,"start":15783,"end":15815},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15816},"to":{"change":11,"start":15816,"end":15944},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15944},"to":{"change":11,"start":1768,"end":1790},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1790},"to":{"change":11,"start":15944,"end":16124},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15944},"to":{"change":11,"start":15944,"end":16124},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":16124},"to":{"change":11,"start":16124,"end":16595},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" } else if *is_tag {"},{"Add":" let has_tag = if let Some(n) ="},{"Add":" txn.channel_has_state(txn.states(¤t_channel.read()), &m.into())?"},{"Add":" {"},{"Add":" txn.is_tagged(txn.tags(¤t_channel.read()), n.into())?"},{"Add":" } else {"},{"Add":" false"},{"Add":" };"},{"Add":" if !has_tag {"},{"Add":" to_download.push(CS::State(*m));"}],"del_contents":[{"Del":" }\n }\n"},{"Del":" Ok(RemoteDelta {\n inodes,\n remote_ref: Some(remote_ref),\n to_download,\n"},{"Del":" tags,\n"},{"Del":" ours_ge_dichotomy_set,\n theirs_ge_dichotomy,\n theirs_ge_dichotomy_set,\n remote_unrecs,\n })\n } else {\n"},{"Del":" let mut to_download: Vec = Vec::new();\n for thing in txn.iter_remote(&remote_ref.lock().remote, 0)? {\n let (n, libpijul::pristine::Pair { a: hash, b: merkle }) = thing?;\n if u64::from(*n) < dichotomy_n {\n if state_cond(txn, &merkle)? {\n continue;\n } else if change_cond(txn, &hash.into()) {\n to_download.push(Hash::from(hash));\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":737,"ins":{"up_context":[{"change":11,"pos":16635}],"down_context":[{"change":11,"pos":1972}],"flag":"BLOCK","start":13816,"end":14281,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":16635},"to":{"change":11,"start":16635,"end":16649},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":16649},"to":{"change":11,"start":1791,"end":1897},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1897},"to":{"change":11,"start":16709,"end":16793},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":16709},"to":{"change":11,"start":16709,"end":16793},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":16793},"to":{"change":11,"start":16793,"end":16902},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":16902},"to":{"change":11,"start":1898,"end":1972},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" // Additionally, if there are no remote unrecords"},{"Add":" // (i.e. if `should_cache`), cache."},{"Add":" if should_cache && ours_ge_dichotomy_set.get(&ch).is_none() {"},{"Add":" use libpijul::ChannelMutTxnT;"},{"Add":" txn.put_remote(&mut remote_ref, *n, (*h, *m))?;"},{"Add":" if *is_tag {"},{"Add":" let mut rem = remote_ref.lock();"},{"Add":" txn.put_tags(&mut rem.tags, *n, m)?;"}],"del_contents":[{"Del":" }\n"},{"Del":" let mut tags = HashSet::new();\n for (_, hash, merkle, t) in &theirs_ge_dichotomy {\n"},{"Del":" if state_cond(txn, &merkle.into())? {\n continue;\n"},{"Del":" } else if change_cond(txn, &hash) {\n to_download.push(Hash::from(*hash));\n"},{"Del":" if *t {\n tags.insert(*merkle);\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":748,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":16934},"to":{"change":11,"start":16934,"end":16935},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":752,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":17063},"to":{"change":11,"start":1995,"end":2017},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" tags,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":769,"ins":{"up_context":[{"change":11,"pos":17675}],"down_context":[{"change":11,"pos":17737}],"flag":"BLOCK","start":14282,"end":14354,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":17675},"to":{"change":11,"start":2111,"end":2182},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let f = |v: &mut Vec<(u64, Hash, Merkle, bool)>, n, h, m, m2| {"}],"del_contents":[{"Del":" let f = |v: &mut Vec<(u64, Hash, Merkle, bool)>, n, h, m, t| {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":771,"ins":{"up_context":[{"change":11,"pos":17778}],"down_context":[{"change":11,"pos":17812}],"flag":"BLOCK","start":14355,"end":14393,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":17778},"to":{"change":11,"start":2183,"end":2220},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" Ok(v.push((n, h, m, m2)))"}],"del_contents":[{"Del":" Ok(v.push((n, h, m, t)))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":789,"ins":{"up_context":[{"change":11,"pos":57606}],"down_context":[{"change":11,"pos":57634}],"flag":"BLOCK","start":14394,"end":14442,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57606},"to":{"change":11,"start":57606,"end":57634},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" remote: &libpijul::pristine::Remote,"}],"del_contents":[{"Del":" remote: &T::Remote,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":792,"ins":{"up_context":[{"change":11,"pos":57695}],"down_context":[{"change":11,"pos":7344}],"flag":"BLOCK","start":14443,"end":14542,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57695},"to":{"change":11,"start":7253,"end":7344},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let (mut b, state): (_, Merkle) = if let Some((u, v)) = txn.last_remote(&remote.remote)? {"}],"del_contents":[{"Del":" let (mut b, state): (_, Merkle) = if let Some((u, v)) = txn.last_remote(remote)? {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":799,"ins":{"up_context":[{"change":11,"pos":57913}],"down_context":[{"change":11,"pos":58004}],"flag":"BLOCK","start":14543,"end":14948,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57913},"to":{"change":11,"start":1721,"end":1789},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1789},"to":{"change":11,"start":57976,"end":58004},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":57976},"to":{"change":11,"start":57976,"end":58004},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let last_statet = if let Some((_, _, v)) = txn.last_remote_tag(&remote.tags)? {"},{"Add":" v.into()"},{"Add":" } else {"},{"Add":" Merkle::zero()"},{"Add":" };"},{"Add":" debug!(\"last_state: {:?} {:?}\", state, last_statet);"},{"Add":" if let Some((_, s, st)) = self.get_state(txn, Some(b)).await? {"},{"Add":" debug!(\"remote last_state: {:?} {:?}\", s, st);"},{"Add":" if s == state && st == last_statet {"}],"del_contents":[{"Del":" if let Some((_, s)) = self.get_state(txn, Some(b)).await? {\n"},{"Del":" if s == state {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":817,"ins":{"up_context":[{"change":11,"pos":58358}],"down_context":[{"change":11,"pos":1790}],"flag":"BLOCK","start":14949,"end":15500,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":58358},"to":{"change":11,"start":7437,"end":7513},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let (mid, state) = {"},{"Add":" let (a, b) = txn.get_remote_state(&remote.remote, mid)?.unwrap();"},{"Add":" (a, b.b)"},{"Add":" };"},{"Add":" let statet = if let Some((_, b)) = txn.get_remote_tag(&remote.tags, mid)? {"},{"Add":" // There's still a tag at position >= mid in the"},{"Add":" // sequence."},{"Add":" b.b.into()"},{"Add":" } else {"},{"Add":" // No tag at or after mid, the last state, `statet`,"},{"Add":" // is the right answer in that case."},{"Add":" last_statet"},{"Add":" };"},{"Add":""}],"del_contents":[{"Del":" let (mid, state) = txn.get_remote_state(remote, mid)?.unwrap();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":833,"ins":{"up_context":[{"change":11,"pos":58577}],"down_context":[{"change":11,"pos":58680}],"flag":"BLOCK","start":15501,"end":15646,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":58577},"to":{"change":11,"start":58577,"end":58637},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":58637},"to":{"change":11,"start":7514,"end":7559},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if let Some((_, remote_state, remote_statet)) = remote_state {"},{"Add":" if remote_state == state && remote_statet == statet {"}],"del_contents":[{"Del":" if let Some((_, remote_state)) = remote_state {\n"},{"Del":" if remote_state == state.b {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":856,"ins":{"up_context":[{"change":11,"pos":59114}],"down_context":[{"change":11,"pos":59170}],"flag":"BLOCK","start":15647,"end":15711,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":59114},"to":{"change":11,"start":59114,"end":59170},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" ) -> Result, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":936,"ins":{"up_context":[{"change":11,"pos":1161}],"down_context":[{"change":11,"pos":518}],"flag":"BLOCK","start":15712,"end":15785,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1161},"to":{"change":11,"start":2221,"end":2297},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" let f = |a: &mut (&mut T, &mut RemoteRef), n, h, m, is_tag| {"}],"del_contents":[{"Del":" let f = |a: &mut (&mut T, &mut RemoteRef), n, h, m, is_tagged| {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":938,"ins":{"up_context":[{"change":11,"pos":570}],"down_context":[{"change":11,"pos":618}],"flag":"BLOCK","start":15786,"end":15942,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":570},"to":{"change":11,"start":2298,"end":2357},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" txn.put_remote(remote, n, (h, m))?;"},{"Add":" if is_tag {"},{"Add":" txn.put_tags(&mut remote.lock().tags, n, &m.into())?;"},{"Add":" }"}],"del_contents":[{"Del":" txn.put_remote(remote, n, (h, m, is_tagged))?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":966,"ins":{"up_context":[{"change":11,"pos":65261}],"down_context":[{"change":11,"pos":65287}],"flag":"BLOCK","start":15943,"end":15967,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":65261},"to":{"change":11,"start":65261,"end":65287},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" changes: &[CS],"}],"del_contents":[{"Del":" changes: &[Hash],\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1001,"ins":{"up_context":[{"change":11,"pos":398}],"down_context":[{"change":11,"pos":66747}],"flag":"BLOCK","start":15968,"end":16081,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":398},"to":{"change":11,"start":1589,"end":1674},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1589},"to":{"change":11,"start":1589,"end":1674},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1205},"to":{"change":11,"start":10700,"end":10772},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1674},"to":{"change":11,"start":10700,"end":10772},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":10700},"to":{"change":11,"start":10700,"end":10772},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" hashes: &mut tokio::sync::mpsc::UnboundedReceiver,"},{"Add":" send: &mut tokio::sync::mpsc::Sender,"}],"del_contents":[{"Del":" hashes: &mut tokio::sync::mpsc::UnboundedReceiver,\n"},{"Del":" send: &mut tokio::sync::mpsc::Sender,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1047,"ins":{"up_context":[{"change":11,"pos":68892}],"down_context":[{"change":11,"pos":1320}],"flag":"BLOCK","start":16082,"end":16107,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":68892},"to":{"change":11,"start":160,"end":187},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" to_apply: &[CS],"}],"del_contents":[{"Del":" to_apply: &[Hash],\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1050,"ins":{"up_context":[{"change":11,"pos":68948}],"down_context":[{"change":11,"pos":711}],"flag":"BLOCK","start":16108,"end":16150,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":68948},"to":{"change":11,"start":1363,"end":1407},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" ) -> Result, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1085,"ins":{"up_context":[{"change":11,"pos":259}],"down_context":[{"change":11,"pos":440}],"flag":"BLOCK","start":16151,"end":16552,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":259},"to":{"change":11,"start":259,"end":402},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":402},"to":{"change":11,"start":3096,"end":3173},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if let CS::Change(h) = h {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut change_path_, h);"},{"Add":" if std::fs::metadata(&change_path_).is_err() {"},{"Add":" hash_send.send(CS::Change(*h))?;"},{"Add":" to_download.insert(CS::Change(*h));"},{"Add":" }"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut change_path_);"}],"del_contents":[{"Del":" libpijul::changestore::filesystem::push_filename(&mut change_path_, h);\n if std::fs::metadata(&change_path_).is_err() {\n"},{"Del":" hash_send.send(*h)?;\n to_download.insert(*h);\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1093,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":454},"to":{"change":11,"start":454,"end":534},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" libpijul::changestore::filesystem::pop_filename(&mut change_path_);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1113,"ins":{"up_context":[{"change":11,"pos":1641}],"down_context":[{"change":11,"pos":2262}],"flag":"BLOCK","start":16553,"end":17304,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1641},"to":{"change":11,"start":1641,"end":2262},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if let CS::Change(h) = h {"},{"Add":" let changes = repo.changes.get_changes(h)?;"},{"Add":" changes.iter().any(|c| {"},{"Add":" c.iter().any(|c| {"},{"Add":" let inode = c.inode();"},{"Add":" debug!(\"inode = {:?}\", inode);"},{"Add":" if let Some(h) = inode.change {"},{"Add":" inodes.contains(&Position {"},{"Add":" change: h,"},{"Add":" pos: inode.pos,"},{"Add":" })"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" })"}],"del_contents":[{"Del":" let changes = repo.changes.get_changes(h)?;\n changes.iter().any(|c| {\n c.iter().any(|c| {\n let inode = c.inode();\n debug!(\"inode = {:?}\", inode);\n if let Some(h) = inode.change {\n inodes.contains(&Position {\n change: h,\n pos: inode.pos,\n })\n } else {\n false\n }\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1129,"ins":{"up_context":[{"change":11,"pos":2289}],"down_context":[{"change":11,"pos":2312}],"flag":"BLOCK","start":17305,"end":17386,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2289},"to":{"change":11,"start":2289,"end":2312},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" } else {"},{"Add":" false"},{"Add":" }"}],"del_contents":[{"Del":" })\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1133,"ins":{"up_context":[{"change":11,"pos":2330}],"down_context":[{"change":11,"pos":2392}],"flag":"BLOCK","start":17387,"end":17461,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2330},"to":{"change":11,"start":2330,"end":2392},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" || { inodes.iter().any(|i| CS::Change(i.change) == *h) };"}],"del_contents":[{"Del":" || { inodes.iter().any(|i| i.change == *h) };\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1145,"ins":{"up_context":[{"change":11,"pos":3600}],"down_context":[{"change":11,"pos":3601}],"flag":"BLOCK","start":17462,"end":17661,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3600},"to":{"change":11,"start":478,"end":529},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":529},"to":{"change":11,"start":60,"end":139},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":60},"to":{"change":11,"start":60,"end":139},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if let CS::Change(h) = h {"},{"Add":" let mut channel = channel.write();"},{"Add":" txn.apply_change_ws(&repo.changes, &mut channel, h, &mut ws)?;"},{"Add":" }"}],"del_contents":[{"Del":" let mut channel = channel.write();\n"},{"Del":" txn.apply_change_ws(&repo.changes, &mut channel, h, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1199,"ins":{"up_context":[{"change":11,"pos":71974}],"down_context":[{"change":11,"pos":72012}],"flag":"BLOCK","start":17662,"end":17706,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":71974},"to":{"change":11,"start":4069,"end":4101},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" send_hash.send(CS::Change(h))?;"}],"del_contents":[{"Del":" send_hash.send(h)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1205,"ins":{"up_context":[{"change":11,"pos":72174}],"down_context":[{"change":11,"pos":72577}],"flag":"BLOCK","start":17707,"end":18302,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":72174},"to":{"change":11,"start":72174,"end":72533},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":72533},"to":{"change":11,"start":4102,"end":4140},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if let CS::Change(hash) = hash {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut change_path, &hash);"},{"Add":" std::fs::create_dir_all(change_path.parent().unwrap())?;"},{"Add":" use libpijul::changestore::ChangeStore;"},{"Add":" hashes.push(CS::Change(hash));"},{"Add":" for dep in repo.changes.get_dependencies(&hash)? {"},{"Add":" let dep: libpijul::pristine::Hash = dep;"},{"Add":" send_hash.send(CS::Change(dep))?;"},{"Add":" }"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut change_path);"}],"del_contents":[{"Del":" libpijul::changestore::filesystem::push_filename(&mut change_path, &hash);\n std::fs::create_dir_all(change_path.parent().unwrap())?;\n use libpijul::changestore::ChangeStore;\n hashes.push(hash);\n for dep in repo.changes.get_dependencies(&hash)? {\n let dep: libpijul::pristine::Hash = dep;\n"},{"Del":" send_hash.send(dep)?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1216,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":72591},"to":{"change":11,"start":72591,"end":72670},"introduced_by":11}],"inode":{"change":11,"pos":52474}}},"contents":[{"Del":" libpijul::changestore::filesystem::pop_filename(&mut change_path);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1223,"ins":{"up_context":[{"change":11,"pos":247}],"down_context":[{"change":11,"pos":330}],"flag":"BLOCK","start":18303,"end":18457,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":247},"to":{"change":11,"start":247,"end":330},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" if let CS::Change(hash) = hash {"},{"Add":" txn.apply_change_ws(&repo.changes, &mut channel_, hash, &mut ws)?;"},{"Add":" }"}],"del_contents":[{"Del":" txn.apply_change_ws(&repo.changes, &mut channel_, hash, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1254,"ins":{"up_context":[{"change":11,"pos":7876}],"down_context":[{"change":11,"pos":7914}],"flag":"BLOCK","start":18458,"end":18508,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":7876},"to":{"change":11,"start":7876,"end":7914},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" to_pull.push(CS::Change(p.a.into()));"}],"del_contents":[{"Del":" to_pull.push(p.a.into());\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1277,"ins":{"up_context":[{"change":11,"pos":74955}],"down_context":[{"change":11,"pos":74981}],"flag":"BLOCK","start":18509,"end":18533,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":74955},"to":{"change":11,"start":74955,"end":74981},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" changes: &[CS],"}],"del_contents":[{"Del":" changes: &[Hash],\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1303,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":76104}],"down_context":[{"change":11,"pos":7945}],"flag":"BLOCK","start":18534,"end":18666,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":" let c = if let CS::Change(c) = c {"},{"Add":" c"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1318,"ins":{"up_context":[{"change":11,"pos":76328}],"down_context":[{"change":11,"pos":2508}],"flag":"BLOCK","start":18667,"end":18716,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":76328},"to":{"change":11,"start":4513,"end":4550},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" send_hash.send(CS::Change(*c))?;"}],"del_contents":[{"Del":" send_hash.send(*c)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1342,"ins":{"up_context":[{"change":11,"pos":2672}],"down_context":[{"change":11,"pos":2575}],"flag":"BLOCK","start":18717,"end":18770,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2672},"to":{"change":11,"start":4551,"end":4592},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" send_hash.send(CS::Change(*c))?;"}],"del_contents":[{"Del":" send_hash.send(*c)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1373,"ins":{"up_context":[{"change":11,"pos":8353}],"down_context":[{"change":11,"pos":8395}],"flag":"BLOCK","start":18771,"end":18825,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":8353},"to":{"change":11,"start":8353,"end":8395},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" pullable.push(CS::Change(p.a.into()))"}],"del_contents":[{"Del":" pullable.push(p.a.into())\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1403,"ins":{"up_context":[{"change":11,"pos":2588}],"down_context":[{"change":11,"pos":2613}],"flag":"BLOCK","start":18826,"end":18845,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2588},"to":{"change":11,"start":2588,"end":2613},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" tag: bool,"}],"del_contents":[{"Del":" is_tagged: bool,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1420,"ins":{"up_context":[{"change":11,"pos":3818}],"down_context":[{"change":11,"pos":3818}],"flag":"BLOCK","start":18846,"end":18895,"inode":{"change":11,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3818},"to":{"change":11,"start":2621,"end":2676},"introduced_by":11}],"inode":{"change":11,"pos":52474}},"ins_contents":[{"Add":" tag: caps.name(\"tag\").is_some(),"}],"del_contents":[{"Del":" is_tagged: caps.name(\"tag\").is_some(),\n"}]}},{"Edit":{"inode":{"change":11,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1442,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":373}],"down_context":[{"change":11,"pos":79731}],"flag":"BLOCK","start":18896,"end":20381,"inode":{"change":11,"pos":52474}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"/// Compare the remote set (theirs_ge_dichotomy) with our current"},{"Add":"/// version of that (ours_ge_dichotomy) and return the changes in our"},{"Add":"/// current version that are not in the remote anymore."},{"Add":"fn remote_unrecs("},{"Add":" txn: &T,"},{"Add":" current_channel: &ChannelRef,"},{"Add":" ours_ge_dichotomy: &[(u64, CS)],"},{"Add":" theirs_ge_dichotomy_set: &HashSet,"},{"Add":") -> Result, anyhow::Error> {"},{"Add":" let mut remote_unrecs = Vec::new();"},{"Add":" for (n, hash) in ours_ge_dichotomy {"},{"Add":" debug!(\"ours_ge_dichotomy: {:?} {:?}\", n, hash);"},{"Add":" if theirs_ge_dichotomy_set.contains(hash) {"},{"Add":" // If this change is still present in the remote, skip"},{"Add":" debug!(\"still present\");"},{"Add":" continue;"},{"Add":" } else {"},{"Add":" let has_it = match hash {"},{"Add":" CS::Change(hash) => txn.get_revchanges(¤t_channel, &hash)?.is_some(),"},{"Add":" CS::State(state) => {"},{"Add":" let ch = current_channel.read();"},{"Add":" if let Some(n) = txn.channel_has_state(txn.states(&*ch), &state.into())? {"},{"Add":" txn.is_tagged(txn.tags(&*ch), n.into())?"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":" if has_it {"},{"Add":" remote_unrecs.push((*n, *hash))"},{"Add":" } else {"},{"Add":" // If this unrecord wasn't in our current channel, skip"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(remote_unrecs)"}]}},{"Edit":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":552}],"down_context":[{"change":11,"pos":79900}],"flag":"BLOCK","start":20382,"end":20406,"inode":{"change":11,"pos":79745}}},"contents":[{"Add":""},{"Add":"use crate::remote::CS;"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":25,"ins":{"up_context":[{"change":11,"pos":3106}],"down_context":[{"change":11,"pos":3226}],"flag":"BLOCK","start":20407,"end":20858,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3106},"to":{"change":11,"start":9863,"end":9915},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":9915},"to":{"change":11,"start":3135,"end":3164},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3135},"to":{"change":11,"start":3135,"end":3164},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3164},"to":{"change":11,"start":9916,"end":9983},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":") -> Result, anyhow::Error> {"},{"Add":" if let Some(x) = txn.reverse_log(&*channel.read(), mid)?.next() {"},{"Add":" let (n, (_, m)) = x?;"},{"Add":" if let Some(m2) = txn"},{"Add":" .rev_iter_tags(txn.tags(&*channel.read()), Some(n.into()))?"},{"Add":" .next()"},{"Add":" {"},{"Add":" let (_, m2) = m2?;"},{"Add":" Ok(Some((n, m.into(), m2.b.into())))"},{"Add":" } else {"},{"Add":" Ok(Some((n, m.into(), Merkle::zero())))"},{"Add":" }"}],"del_contents":[{"Del":") -> Result, anyhow::Error> {\n"},{"Del":" if let Some(mid) = mid {\n"},{"Del":" Ok(txn.get_changes(&channel, mid)?.map(|(_, m)| (mid, m)))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":38,"ins":{"up_context":[{"change":11,"pos":3239}],"down_context":[{"change":11,"pos":3347}],"flag":"BLOCK","start":20859,"end":20876,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3239},"to":{"change":11,"start":939,"end":1008},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":909},"to":{"change":11,"start":10054,"end":10096},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1008},"to":{"change":11,"start":10054,"end":10096},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":10054},"to":{"change":11,"start":10054,"end":10096},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":10096},"to":{"change":11,"start":8666,"end":8692},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":8692},"to":{"change":11,"start":10115,"end":10127},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":10115},"to":{"change":11,"start":10115,"end":10127},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" Ok(None)"}],"del_contents":[{"Del":" Ok(txn.reverse_log(&*channel.read(), None)?.next().map(|n| {\n"},{"Del":" let (n, (_, m)) = n.unwrap();\n"},{"Del":" (n, m.into())\n"},{"Del":" }))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":43,"ins":{"up_context":[{"change":11,"pos":80117}],"down_context":[{"change":11,"pos":80217}],"flag":"BLOCK","start":20877,"end":21008,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":80117},"to":{"change":11,"start":80117,"end":80217},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" pub fn get_state("},{"Add":" &mut self,"},{"Add":" mid: Option,"},{"Add":" ) -> Result, anyhow::Error> {"}],"del_contents":[{"Del":" pub fn get_state(&mut self, mid: Option) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":107,"ins":{"up_context":[{"change":11,"pos":8962}],"down_context":[{"change":11,"pos":10768}],"flag":"BLOCK","start":21009,"end":21290,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":8962},"to":{"change":11,"start":1113,"end":1179},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":""},{"Add":" let rem = remote_channel.read();"},{"Add":" let tags: Vec = remote_txn"},{"Add":" .iter_tags(remote_txn.tags(&*rem), from)?"},{"Add":" .map(|k| (*k.unwrap().0).into())"},{"Add":" .collect();"},{"Add":" let mut tagsi = 0;"},{"Add":""},{"Add":" for x in remote_txn.log(&*rem, from)? {"}],"del_contents":[{"Del":" for x in remote_txn.log(&*remote_channel.read(), from)? {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":128,"ins":{"up_context":[{"change":11,"pos":9387}],"down_context":[{"change":11,"pos":82051}],"flag":"BLOCK","start":21291,"end":21528,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":9387},"to":{"change":11,"start":2758,"end":2978},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" if tags.get(tagsi) == Some(&n) {"},{"Add":" f(a, n, h.into(), m.into(), true)?;"},{"Add":" tagsi += 1;"},{"Add":" } else {"},{"Add":" f(a, n, h.into(), m.into(), false)?;"},{"Add":" }"}],"del_contents":[{"Del":" f(\n a,\n n,\n h.into(),\n m.into(),\n remote_txn.is_tagged(&remote_channel.read().tags, n)?,\n )?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":144,"ins":{"up_context":[{"change":11,"pos":82205}],"down_context":[{"change":11,"pos":82231}],"flag":"BLOCK","start":21529,"end":21553,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82205},"to":{"change":11,"start":82205,"end":82231},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" changes: &[CS],"}],"del_contents":[{"Del":" changes: &[Hash],\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":155,"ins":{"up_context":[{"change":11,"pos":82584}],"down_context":[{"change":11,"pos":82751}],"flag":"BLOCK","start":21554,"end":22069,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82584},"to":{"change":11,"start":82584,"end":82751},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" match c {"},{"Add":" CS::Change(c) => {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut local, &c);"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);"},{"Add":" }"},{"Add":" CS::State(c) => {"},{"Add":" libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);"},{"Add":" libpijul::changestore::filesystem::push_tag_filename(&mut self.changes_dir, &c);"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" libpijul::changestore::filesystem::push_filename(&mut local, &c);\n libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);\n"}]}},{"Edit":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":172,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":3543}],"down_context":[{"change":11,"pos":83218}],"flag":"BLOCK","start":22070,"end":22265,"inode":{"change":11,"pos":79745}}},"contents":[{"Add":" debug!(\"hard link done\");"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut local);"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":196,"ins":{"up_context":[{"change":11,"pos":2860}],"down_context":[{"change":11,"pos":11839}],"flag":"BLOCK","start":22266,"end":22379,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":2860},"to":{"change":11,"start":4665,"end":4750},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4665},"to":{"change":11,"start":4665,"end":4750},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2841},"to":{"change":11,"start":11767,"end":11839},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4750},"to":{"change":11,"start":11767,"end":11839},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11767},"to":{"change":11,"start":11767,"end":11839},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" hashes: &mut tokio::sync::mpsc::UnboundedReceiver,"},{"Add":" send: &mut tokio::sync::mpsc::Sender,"}],"del_contents":[{"Del":" hashes: &mut tokio::sync::mpsc::UnboundedReceiver,\n"},{"Del":" send: &mut tokio::sync::mpsc::Sender,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":201,"ins":{"up_context":[{"change":11,"pos":2892}],"down_context":[{"change":11,"pos":12157}],"flag":"BLOCK","start":22380,"end":23250,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2892},"to":{"change":11,"start":2892,"end":3058},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3058},"to":{"change":11,"start":2861,"end":2926},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":270},"to":{"change":11,"start":12057,"end":12157},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2926},"to":{"change":11,"start":12057,"end":12157},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":3058},"to":{"change":11,"start":12057,"end":12157},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4807},"to":{"change":11,"start":12057,"end":12157},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12057},"to":{"change":11,"start":12057,"end":12157},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" if let CS::Change(c) = c {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut path, &c);"},{"Add":" super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();"},{"Add":" if std::fs::metadata(&path).is_ok() {"},{"Add":" debug!(\"metadata {:?} ok\", path);"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut path);"},{"Add":" continue;"},{"Add":" }"},{"Add":" std::fs::create_dir_all(&path.parent().unwrap())?;"},{"Add":" if std::fs::hard_link(&self.changes_dir, &path).is_err() {"},{"Add":" std::fs::copy(&self.changes_dir, &path)?;"},{"Add":" }"},{"Add":" debug!(\"hard link done\");"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);"}],"del_contents":[{"Del":" libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);\n libpijul::changestore::filesystem::push_filename(&mut path, &c);\n"},{"Del":" super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();\n"},{"Del":" if std::fs::metadata(&path).is_ok() {\n debug!(\"metadata {:?} ok\", path);\n"}]}},{"Edit":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":217,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12233},"to":{"change":11,"start":943,"end":969},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":969},"to":{"change":11,"start":12258,"end":12272},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12258},"to":{"change":11,"start":12258,"end":12272},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12272},"to":{"change":11,"start":12272,"end":12464},"introduced_by":11}],"inode":{"change":11,"pos":79745}}},"contents":[{"Del":" continue;\n"},{"Del":" }\n"},{"Del":" std::fs::create_dir_all(&path.parent().unwrap())?;\n if std::fs::hard_link(&self.changes_dir, &path).is_err() {\n std::fs::copy(&self.changes_dir, &path)?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":218,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12478},"to":{"change":11,"start":12478,"end":12672},"introduced_by":11}],"inode":{"change":11,"pos":79745}}},"contents":[{"Del":" debug!(\"hard link done\");\n libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);\n libpijul::changestore::filesystem::pop_filename(&mut path);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":263,"ins":{"up_context":[{"change":11,"pos":394}],"down_context":[{"change":11,"pos":4010}],"flag":"BLOCK","start":23251,"end":23271,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":394},"to":{"change":11,"start":3988,"end":4010},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3988},"to":{"change":11,"start":3988,"end":4010},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" changes: &[CS],"}],"del_contents":[{"Del":" changes: &[Hash],\n"}]}},{"Replacement":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":268,"ins":{"up_context":[{"change":11,"pos":4116}],"down_context":[{"change":11,"pos":930}],"flag":"BLOCK","start":23272,"end":23926,"inode":{"change":11,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4116},"to":{"change":11,"start":444,"end":508},"introduced_by":11}],"inode":{"change":11,"pos":79745}},"ins_contents":[{"Add":" match c {"},{"Add":" CS::Change(c) => {"},{"Add":" txn.apply_change_ws(store, &mut *channel, c, &mut ws)?;"},{"Add":" }"},{"Add":" CS::State(c) => {"},{"Add":" if let Some(n) = txn.channel_has_state(txn.states(&*channel), &c.into())? {"},{"Add":" let tags = txn.tags_mut(&mut *channel);"},{"Add":" txn.put_tags(tags, n.into(), c)?;"},{"Add":" } else {"},{"Add":" bail!("},{"Add":" \"Cannot add tag {}: channel {:?} does not have that state\","},{"Add":" c.to_base32(),"},{"Add":" txn.name(&*channel)"},{"Add":" )"},{"Add":" }"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" txn.apply_change_ws(store, &mut *channel, c, &mut ws)?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":289,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":3543},"to":{"change":11,"start":82954,"end":83149},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82954},"to":{"change":11,"start":82954,"end":83149},"introduced_by":11}],"inode":{"change":11,"pos":79745}}},"contents":[{"Del":" debug!(\"hard link done\");\n libpijul::changestore::filesystem::pop_filename(&mut local);\n libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);\n"}]}},{"SolveOrderConflict":{"inode":{"change":11,"pos":79745},"path":"pijul/src/remote/local.rs","line":289,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":4265}],"down_context":[],"flag":"","start":23927,"end":23927,"inode":{"change":11,"pos":79745}}},"contents":[]}},{"Edit":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":32}],"down_context":[{"change":11,"pos":0}],"flag":"BLOCK","start":23928,"end":23952,"inode":{"change":100,"pos":10}}},"contents":[{"Add":""},{"Add":"use crate::remote::CS;"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":25,"ins":{"up_context":[{"change":11,"pos":124}],"down_context":[{"change":11,"pos":259}],"flag":"BLOCK","start":23953,"end":24470,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":124},"to":{"change":11,"start":124,"end":157},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":157},"to":{"change":11,"start":0,"end":55},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":55},"to":{"change":11,"start":190,"end":259},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":190},"to":{"change":11,"start":190,"end":259},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" c: CS,"},{"Add":") -> Result {"},{"Add":" let (req, c32) = match c {"},{"Add":" CS::Change(c) => {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut path, &c);"},{"Add":" (\"change\", c.to_base32())"},{"Add":" }"},{"Add":" CS::State(c) => {"},{"Add":" libpijul::changestore::filesystem::push_tag_filename(&mut path, &c);"},{"Add":" if std::fs::metadata(&path).is_ok() {"},{"Add":" bail!(\"Tag already downloaded: {}\", c.to_base32())"},{"Add":" }"},{"Add":" (\"tag\", c.to_base32())"},{"Add":" }"},{"Add":" };"}],"del_contents":[{"Del":" c: libpijul::pristine::Hash,\n"},{"Del":") -> Result {\n"},{"Del":" libpijul::changestore::filesystem::push_filename(&mut path, &c);\n"}]}},{"Edit":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":43,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":89},"to":{"change":11,"start":406,"end":499},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":406},"to":{"change":11,"start":406,"end":499},"introduced_by":11}],"inode":{"change":100,"pos":10}}},"contents":[{"Del":" libpijul::changestore::filesystem::pop_filename(&mut path);\n let c32 = c.to_base32();\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":67,"ins":{"up_context":[{"change":11,"pos":139}],"down_context":[{"change":11,"pos":179}],"flag":"BLOCK","start":24471,"end":24506,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":139},"to":{"change":11,"start":139,"end":179},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" .query(&[(req, &c32)])"}],"del_contents":[{"Del":" .query(&[(\"change\", &c32)])\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":121,"ins":{"up_context":[{"change":11,"pos":1318}],"down_context":[{"change":11,"pos":1385}],"flag":"BLOCK","start":24507,"end":24722,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1318},"to":{"change":11,"start":1318,"end":1385},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" match c {"},{"Add":" CS::Change(_) => {"},{"Add":" std::fs::rename(&path_, &path)?;"},{"Add":" }"},{"Add":" CS::State(_) => {"},{"Add":" std::fs::rename(&path_, &path)?;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" std::fs::rename(&path_, &path_.with_extension(\"change\"))?;\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":139,"ins":{"up_context":[{"change":11,"pos":2949}],"down_context":[{"change":11,"pos":1436}],"flag":"BLOCK","start":24723,"end":24836,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":2949},"to":{"change":11,"start":4891,"end":4976},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4891},"to":{"change":11,"start":4891,"end":4976},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":3169},"to":{"change":11,"start":1180,"end":1252},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4976},"to":{"change":11,"start":1180,"end":1252},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1180},"to":{"change":11,"start":1180,"end":1252},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" hashes: &mut tokio::sync::mpsc::UnboundedReceiver,"},{"Add":" send: &mut tokio::sync::mpsc::Sender,"}],"del_contents":[{"Del":" hashes: &mut tokio::sync::mpsc::UnboundedReceiver,\n"},{"Del":" send: &mut tokio::sync::mpsc::Sender,\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":190,"ins":{"up_context":[{"change":11,"pos":938}],"down_context":[{"change":11,"pos":974}],"flag":"BLOCK","start":24837,"end":24861,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":938},"to":{"change":11,"start":938,"end":974},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" changes: &[CS],"}],"del_contents":[{"Del":" changes: &[libpijul::Hash],\n"}]}},{"Edit":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":193,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1148},"to":{"change":11,"start":1148,"end":1226},"introduced_by":11}],"inode":{"change":100,"pos":10}}},"contents":[{"Del":" libpijul::changestore::filesystem::push_filename(&mut local, &c);\n"}]}},{"Edit":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":203,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":1541},"to":{"change":11,"start":1289,"end":1338},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1289},"to":{"change":11,"start":1289,"end":1338},"introduced_by":11}],"inode":{"change":100,"pos":10}}},"contents":[{"Del":" let change = std::fs::read(&local)?;\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":208,"ins":{"up_context":[{"change":11,"pos":1506}],"down_context":[{"change":11,"pos":1585}],"flag":"BLOCK","start":24862,"end":25771,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1506},"to":{"change":11,"start":1506,"end":1585},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" let base32;"},{"Add":" let body = match c {"},{"Add":" CS::Change(c) => {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut local, &c);"},{"Add":" let change = std::fs::read(&local)?;"},{"Add":" base32 = c.to_base32();"},{"Add":" to_channel.push((\"apply\", &base32));"},{"Add":" change"},{"Add":" }"},{"Add":" CS::State(c) => {"},{"Add":" libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);"},{"Add":" let mut tag_file = libpijul::tag::OpenTagFile::open(&local, &c)?;"},{"Add":" let mut v = Vec::new();"},{"Add":" tag_file.short(&mut v)?;"},{"Add":" base32 = c.to_base32();"},{"Add":" to_channel.push((\"tagup\", &base32));"},{"Add":" v"},{"Add":" }"},{"Add":" };"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut local);"}],"del_contents":[{"Del":" let c = c.to_base32();\n to_channel.push((\"apply\", &c));\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":234,"ins":{"up_context":[{"change":11,"pos":355}],"down_context":[{"change":11,"pos":1757}],"flag":"BLOCK","start":25772,"end":25800,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":355},"to":{"change":11,"start":1727,"end":1757},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1727},"to":{"change":11,"start":1727,"end":1757},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" .body(body)"}],"del_contents":[{"Del":" .body(change)\n"}]}},{"Edit":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":250,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":597},"to":{"change":11,"start":1835,"end":1908},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1835},"to":{"change":11,"start":1835,"end":1908},"introduced_by":11}],"inode":{"change":100,"pos":10}}},"contents":[{"Del":" libpijul::changestore::filesystem::pop_filename(&mut local);\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":303,"ins":{"up_context":[{"change":11,"pos":6079}],"down_context":[{"change":11,"pos":6234}],"flag":"BLOCK","start":25801,"end":25890,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6079},"to":{"change":11,"start":3070,"end":3171},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" super::ListLine::Change { n, m, h, tag } => f(a, n, h, m, tag)?,"}],"del_contents":[{"Del":" super::ListLine::Change { n, m, h, is_tagged } => f(a, n, h, m, is_tagged)?,\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":323,"ins":{"up_context":[{"change":11,"pos":242}],"down_context":[{"change":11,"pos":308}],"flag":"BLOCK","start":25891,"end":25975,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":242},"to":{"change":11,"start":242,"end":308},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" ) -> Result, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":348,"ins":{"up_context":[{"change":3,"pos":45}],"down_context":[{"change":11,"pos":1066}],"flag":"BLOCK","start":25976,"end":26024,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":45},"to":{"change":11,"start":1028,"end":1066},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1028},"to":{"change":11,"start":1028,"end":1066},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" if let (Some(n), Some(m), Some(m2)) = ("}],"del_contents":[{"Del":" if let (Some(n), Some(m)) = (\n"}]}},{"Edit":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":352,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":1214}],"down_context":[{"change":11,"pos":1214}],"flag":"BLOCK","start":26025,"end":26122,"inode":{"change":100,"pos":10}}},"contents":[{"Add":" s.next()"},{"Add":" .and_then(|m| libpijul::Merkle::from_base32(m.as_bytes())),"}]}},{"Replacement":{"inode":{"change":100,"pos":10},"path":"pijul/src/remote/http.rs","line":355,"ins":{"up_context":[{"change":11,"pos":1226}],"down_context":[{"change":11,"pos":1255}],"flag":"BLOCK","start":26123,"end":26156,"inode":{"change":100,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1226},"to":{"change":11,"start":1226,"end":1255},"introduced_by":11}],"inode":{"change":100,"pos":10}},"ins_contents":[{"Add":" Ok(Some((n, m, m2)))"}],"del_contents":[{"Del":" Ok(Some((n, m)))\n"}]}},{"Edit":{"inode":{"change":11,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":871}],"down_context":[{"change":11,"pos":871}],"flag":"BLOCK","start":26157,"end":26215,"inode":{"change":11,"pos":95630}}},"contents":[{"Add":"use crate::remote::CS;"},{"Add":"use crate::repository::Repository;"}]}},{"Edit":{"inode":{"change":11,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":12,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":95786},"to":{"change":11,"start":1252,"end":1287},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1287},"to":{"change":11,"start":1287,"end":1288},"introduced_by":11}],"inode":{"change":11,"pos":95630}}},"contents":[{"Del":"use crate::repository::Repository;\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":11,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":74,"ins":{"up_context":[{"change":11,"pos":1926}],"down_context":[{"change":11,"pos":3466}],"flag":"BLOCK","start":26216,"end":26278,"inode":{"change":11,"pos":95630}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":1926},"to":{"change":11,"start":3416,"end":3466},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3416},"to":{"change":11,"start":3416,"end":3466},"introduced_by":11}],"inode":{"change":11,"pos":95630}},"ins_contents":[{"Add":" .map(|h| CS::Change((h.unwrap().1).0.into()))"}],"del_contents":[{"Del":" .map(|h| (h.unwrap().1).0.into())\n"}]}},{"Replacement":{"inode":{"change":11,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":79,"ins":{"up_context":[{"change":11,"pos":3695}],"down_context":[{"change":11,"pos":3769}],"flag":"BLOCK","start":26279,"end":26418,"inode":{"change":11,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3695},"to":{"change":11,"start":3695,"end":3769},"introduced_by":11}],"inode":{"change":11,"pos":95630}},"ins_contents":[{"Add":" if let CS::Change(h) = h {"},{"Add":" hashes.push((*h, *txn.get_internal(&h.into())?.unwrap()))"},{"Add":" }"}],"del_contents":[{"Del":" hashes.push((*h, *txn.get_internal(&h.into())?.unwrap()))\n"}]}},{"Edit":{"inode":{"change":11,"pos":74},"path":"pijul/src/commands/tag.rs","line":16,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":32}],"down_context":[{"change":11,"pos":652}],"flag":"BLOCK","start":26419,"end":26543,"inode":{"change":11,"pos":74}}},"contents":[{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"}]}},{"Replacement":{"inode":{"change":11,"pos":74},"path":"pijul/src/commands/tag.rs","line":187,"ins":{"up_context":[{"change":11,"pos":268}],"down_context":[{"change":11,"pos":440}],"flag":"BLOCK","start":26544,"end":26611,"inode":{"change":11,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":268},"to":{"change":11,"start":690,"end":747},"introduced_by":11}],"inode":{"change":11,"pos":74}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path)?;"}],"del_contents":[{"Del":" let repo = Repository::find_root(None)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":74},"path":"pijul/src/commands/tag.rs","line":189,"ins":{"up_context":[{"change":11,"pos":494}],"down_context":[{"change":11,"pos":494}],"flag":"BLOCK","start":26612,"end":26838,"inode":{"change":11,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":494},"to":{"change":11,"start":602,"end":769},"introduced_by":11}],"inode":{"change":11,"pos":74}},"ins_contents":[{"Add":" let channel_name = self.channel.unwrap_or_else(|| {"},{"Add":" txn.current_channel()"},{"Add":" .unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" .to_string()"},{"Add":" });"}],"del_contents":[{"Del":" let channel_name = txn\n .current_channel()\n .unwrap_or(crate::DEFAULT_CHANNEL)\n .to_string();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":74},"path":"pijul/src/commands/tag.rs","line":202,"ins":{"up_context":[{"change":11,"pos":3209}],"down_context":[{"change":11,"pos":936}],"flag":"BLOCK","start":26839,"end":26959,"inode":{"change":11,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3209},"to":{"change":11,"start":821,"end":936},"introduced_by":11}],"inode":{"change":11,"pos":74}},"ins_contents":[{"Add":" let (t, _) = t?;"},{"Add":" let (_, m) = txn.get_changes(&channel, (*t).into())?.unwrap();"}],"del_contents":[{"Del":" let t = (*t?).into();\n let (_, m) = txn.get_changes(&channel, t)?.unwrap();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":17,"ins":{"up_context":[{"change":11,"pos":4805}],"down_context":[{"change":11,"pos":1761}],"flag":"BLOCK","start":26960,"end":27021,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4805},"to":{"change":11,"start":18517,"end":18574},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":"use crate::remote::{PushDelta, RemoteDelta, RemoteRepo, CS};"}],"del_contents":[{"Del":"use crate::remote::{PushDelta, RemoteDelta, RemoteRepo};\n"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":94,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":113523}],"down_context":[{"change":101,"pos":1896}],"flag":"BLOCK","start":27022,"end":27112,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" /// Push tags instead of regular changes."},{"Add":" #[clap(long = \"tag\")]"},{"Add":" is_tag: bool,"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":131,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":371}],"down_context":[{"change":102,"pos":1648}],"flag":"BLOCK","start":27113,"end":27203,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" /// Pull tags instead of regular changes."},{"Add":" #[clap(long = \"tag\")]"},{"Add":" is_tag: bool,"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":153,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":19337}],"down_context":[{"change":5,"pos":121}],"flag":"BLOCK","start":27204,"end":27226,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" is_tag: bool,"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":163,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":19645}],"down_context":[{"change":11,"pos":19645}],"flag":"BLOCK","start":27227,"end":27251,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" is_tag,"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":234,"ins":{"up_context":[{"change":11,"pos":20360}],"down_context":[{"change":11,"pos":7019}],"flag":"BLOCK","start":27252,"end":27436,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":20360},"to":{"change":11,"start":20360,"end":20436},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" .to_upload("},{"Add":" &mut *txn.write(),"},{"Add":" &mut channel,"},{"Add":" &repo,"},{"Add":" &mut remote,"},{"Add":" self.is_tag,"},{"Add":" )"}],"del_contents":[{"Del":" .to_upload(&mut *txn.write(), &mut channel, &repo, &mut remote)\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":255,"ins":{"up_context":[{"change":11,"pos":426}],"down_context":[{"change":11,"pos":462}],"flag":"BLOCK","start":27437,"end":27482,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":426},"to":{"change":11,"start":11039,"end":11096},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" let mut u: Vec = Vec::new();"}],"del_contents":[{"Del":" let mut u: Vec = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":261,"ins":{"up_context":[{"change":11,"pos":39}],"down_context":[{"change":11,"pos":136}],"flag":"BLOCK","start":27483,"end":27604,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":39},"to":{"change":11,"start":39,"end":136},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" if to_upload.contains(&CS::Change(hash)) {"},{"Add":" u.push(CS::Change(hash));"}],"del_contents":[{"Del":" if to_upload.contains(&hash) {\n u.push(hash);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":273,"ins":{"up_context":[{"change":11,"pos":913}],"down_context":[{"change":11,"pos":884}],"flag":"BLOCK","start":27605,"end":28420,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":913},"to":{"change":11,"start":673,"end":884},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" u.sort_by(|a, b| match (a, b) {"},{"Add":" (CS::Change(a), CS::Change(b)) => {"},{"Add":" let na = txn.get_revchanges(&channel, a).unwrap().unwrap();"},{"Add":" let nb = txn.get_revchanges(&channel, b).unwrap().unwrap();"},{"Add":" na.cmp(&nb)"},{"Add":" }"},{"Add":" (CS::State(a), CS::State(b)) => {"},{"Add":" let na = txn"},{"Add":" .channel_has_state(txn.states(&*channel.read()), &a.into())"},{"Add":" .unwrap()"},{"Add":" .unwrap();"},{"Add":" let nb = txn"},{"Add":" .channel_has_state(txn.states(&*channel.read()), &b.into())"},{"Add":" .unwrap()"},{"Add":" .unwrap();"},{"Add":" na.cmp(&nb)"},{"Add":" }"},{"Add":" _ => unreachable!(),"}],"del_contents":[{"Del":" u.sort_by(|a, b| {\n let na = txn.get_revchanges(&channel, a).unwrap().unwrap();\n let nb = txn.get_revchanges(&channel, b).unwrap().unwrap();\n na.cmp(&nb)\n"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":344,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":20987}],"down_context":[{"change":11,"pos":20987}],"flag":"BLOCK","start":28421,"end":28443,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" is_tag: bool,"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":359,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":21407}],"down_context":[{"change":11,"pos":21407}],"flag":"BLOCK","start":28444,"end":28468,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" is_tag,"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":424,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":21985},"to":{"change":9,"start":107,"end":125},"introduced_by":9}],"inode":{"change":11,"pos":111631}}},"contents":[{"Del":" tags,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":426,"ins":{"up_context":[{"change":11,"pos":22017}],"down_context":[{"change":11,"pos":9431}],"flag":"BLOCK","start":28469,"end":28659,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":22017},"to":{"change":11,"start":22017,"end":22099},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" .to_download("},{"Add":" &mut *txn.write(),"},{"Add":" &mut channel,"},{"Add":" &mut repo,"},{"Add":" &mut remote,"},{"Add":" self.is_tag,"},{"Add":" )"}],"del_contents":[{"Del":" .to_download(&mut *txn.write(), &mut channel, &mut repo, &mut remote)\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":479,"ins":{"up_context":[{"change":11,"pos":197}],"down_context":[{"change":11,"pos":268}],"flag":"BLOCK","start":28660,"end":29393,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":197},"to":{"change":11,"start":11789,"end":11872},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" match h {"},{"Add":" CS::Change(h) => {"},{"Add":" txn.apply_change_rec_ws(&repo.changes, &mut channel, h, &mut ws)?;"},{"Add":" }"},{"Add":" CS::State(s) => {"},{"Add":" if let Some(n) = txn.channel_has_state(&channel.states, &s.into())? {"},{"Add":" txn.put_tags(&mut channel.tags, n.into(), s)?;"},{"Add":" } else {"},{"Add":" bail!("},{"Add":" \"Cannot add tag {}: channel {:?} does not have that state\","},{"Add":" s.to_base32(),"},{"Add":" channel.name"},{"Add":" )"},{"Add":" }"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" txn.apply_change_rec_ws(&repo.changes, &mut channel, h, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":510,"ins":{"up_context":[{"change":11,"pos":839}],"down_context":[{"change":11,"pos":1479}],"flag":"BLOCK","start":29394,"end":30278,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":839},"to":{"change":11,"start":10396,"end":10518},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":10518},"to":{"change":11,"start":952,"end":1144},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":952},"to":{"change":11,"start":952,"end":1144},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1144},"to":{"change":11,"start":1144,"end":1166},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1166},"to":{"change":11,"start":1166,"end":1227},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1227},"to":{"change":11,"start":10519,"end":10602},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":10602},"to":{"change":11,"start":1301,"end":1432},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":12018},"to":{"change":11,"start":1301,"end":1432},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1301},"to":{"change":11,"start":1301,"end":1432},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1432},"to":{"change":11,"start":16143,"end":16191},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" match d {"},{"Add":" CS::Change(d) => {"},{"Add":" if let Some(int) = txn_.get_internal(&d.into())? {"},{"Add":" for inode in txn_.iter_rev_touched(int)? {"},{"Add":" let (int_, inode) = inode?;"},{"Add":" if int_ < int {"},{"Add":" continue;"},{"Add":" } else if int_ > int {"},{"Add":" break;"},{"Add":" }"},{"Add":" let ext = libpijul::pristine::Position {"},{"Add":" change: txn_.get_external(&inode.change)?.unwrap().into(),"},{"Add":" pos: inode.pos,"},{"Add":" };"},{"Add":" if inodes.is_empty() || inodes.contains(&ext) {"},{"Add":" touched.insert(*inode);"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" if let Some(int) = txn_.get_internal(&d.into())? {\n for inode in txn_.iter_rev_touched(int)? {\n"},{"Del":" let (int_, inode) = inode?;\n if int_ < int {\n continue;\n } else if int_ > int {\n break;\n"},{"Del":" }\n"},{"Del":" let ext = libpijul::pristine::Position {\n"},{"Del":" change: txn_.get_external(&inode.change)?.unwrap().into(),\n"},{"Del":" pos: inode.pos,\n };\n if inodes.is_empty() || inodes.contains(&ext) {\n"},{"Del":" touched.insert(*inode);\n"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":529,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":1501}],"down_context":[{"change":11,"pos":1501}],"flag":"BLOCK","start":30279,"end":30455,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" }"},{"Add":" CS::State(_) => {"},{"Add":" // No need to do anything for now here, we don't"},{"Add":" // output after downloading a tag."}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":552,"ins":{"up_context":[{"change":11,"pos":1301}],"down_context":[{"change":6,"pos":42}],"flag":"BLOCK","start":30456,"end":30514,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1301},"to":{"change":6,"start":0,"end":42},"introduced_by":6}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" if touched_paths.is_empty() && !self.is_tag {"}],"del_contents":[{"Del":" if touched_paths.is_empty() {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":602,"ins":{"up_context":[{"change":11,"pos":854}],"down_context":[{"change":4,"pos":237}],"flag":"BLOCK","start":30515,"end":30590,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":854},"to":{"change":4,"start":203,"end":236},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":236},"to":{"change":11,"start":2859,"end":2937},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2859},"to":{"change":11,"start":2859,"end":2937},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" original: &[CS],"},{"Add":" now: &[CS],"},{"Add":") -> Result, anyhow::Error> {"}],"del_contents":[{"Del":" original: &[libpijul::Hash],\n"},{"Del":" now: &[libpijul::Hash],\n) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":612,"ins":{"up_context":[{"change":4,"pos":567}],"down_context":[{"change":4,"pos":638}],"flag":"BLOCK","start":30591,"end":30890,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":567},"to":{"change":11,"start":1171,"end":1214},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1171},"to":{"change":11,"start":1171,"end":1214},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1214},"to":{"change":4,"start":568,"end":638},"introduced_by":4}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" let hh = if let CS::Change(h) = h {"},{"Add":" h"},{"Add":" } else {"},{"Add":" stack.pop();"},{"Add":" result.push(h);"},{"Add":" continue;"},{"Add":" };"},{"Add":" for d in c.get_dependencies(&hh)? {"},{"Add":" if original.get(&CS::Change(d)).is_some() && now_.get(&CS::Change(d)).is_none() {"}],"del_contents":[{"Del":" for d in c.get_dependencies(&h)? {\n"},{"Del":" if original.get(&d).is_some() && now_.get(&d).is_none() {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":622,"ins":{"up_context":[{"change":4,"pos":680}],"down_context":[{"change":11,"pos":1390}],"flag":"BLOCK","start":30891,"end":30934,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":680},"to":{"change":4,"start":680,"end":711},"introduced_by":4}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" stack.push(CS::Change(d));"}],"del_contents":[{"Del":" stack.push(d);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":636,"ins":{"up_context":[{"change":11,"pos":1487}],"down_context":[{"change":11,"pos":122838}],"flag":"BLOCK","start":30935,"end":31032,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":1487},"to":{"change":11,"start":122682,"end":122724},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":122682},"to":{"change":11,"start":122682,"end":122724},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":122724},"to":{"change":11,"start":2938,"end":2999},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2999},"to":{"change":11,"start":122805,"end":122838},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":122805},"to":{"change":11,"start":122805,"end":122838},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":"fn check_deps(c: &C, original: &[CS], now: &[CS]) -> Result<(), anyhow::Error> {"}],"del_contents":[{"Del":"fn check_deps(\n c: &C,\n"},{"Del":" original: &[libpijul::Hash],\n now: &[libpijul::Hash],\n"},{"Del":") -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":641,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":123037}],"down_context":[{"change":11,"pos":123037}],"flag":"BLOCK","start":31033,"end":31099,"inode":{"change":11,"pos":111631}}},"contents":[{"Add":" let n = if let CS::Change(n) = n { n } else { continue };"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":643,"ins":{"up_context":[{"change":11,"pos":123079}],"down_context":[{"change":11,"pos":11137}],"flag":"BLOCK","start":31100,"end":31195,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":123079},"to":{"change":11,"start":123079,"end":123150},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" if original_.get(&CS::Change(d)).is_some() && now_.get(&CS::Change(d)).is_none() {"}],"del_contents":[{"Del":" if original_.get(&d).is_some() && now_.get(&d).is_none() {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":651,"ins":{"up_context":[{"change":11,"pos":22311}],"down_context":[{"change":11,"pos":22390}],"flag":"BLOCK","start":31196,"end":31288,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":22311},"to":{"change":11,"start":22311,"end":22390},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":"fn notify_remote_unrecords(repo: &Repository, remote_unrecs: &[(u64, crate::remote::CS)]) {"}],"del_contents":[{"Del":"fn notify_remote_unrecords(repo: &Repository, remote_unrecs: &[(u64, Hash)]) {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":660,"ins":{"up_context":[{"change":11,"pos":22751}],"down_context":[{"change":11,"pos":22824}],"flag":"BLOCK","start":31289,"end":31497,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":22751},"to":{"change":11,"start":22751,"end":22824},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" let header = match hash {"},{"Add":" CS::Change(hash) => repo.changes.get_header(hash).unwrap(),"},{"Add":" CS::State(hash) => repo.changes.get_tag_header(hash).unwrap(),"},{"Add":" };"}],"del_contents":[{"Del":" let header = &repo.changes.get_change(hash).unwrap().header;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":665,"ins":{"up_context":[{"change":11,"pos":22855}],"down_context":[{"change":11,"pos":23141}],"flag":"BLOCK","start":31498,"end":31934,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":22855},"to":{"change":11,"start":22855,"end":23141},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" writeln!(&mut s, \"# {}\", header.message).unwrap();"},{"Add":" writeln!(&mut s, \"# {}\", header.timestamp).unwrap();"},{"Add":" match hash {"},{"Add":" CS::Change(hash) => {"},{"Add":" writeln!(&mut s, \"# {}\", hash.to_base32()).unwrap();"},{"Add":" }"},{"Add":" CS::State(hash) => {"},{"Add":" writeln!(&mut s, \"# {}\", hash.to_base32()).unwrap();"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" writeln!(&mut s, \"# {}\", header.message).expect(\"Infallible write to String\");\n writeln!(&mut s, \"# {}\", header.timestamp).expect(\"Infallible write to String\");\n writeln!(&mut s, \"# {}\", hash.to_base32()).expect(\"Infallible write to String\");\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":685,"ins":{"up_context":[{"change":11,"pos":23354}],"down_context":[{"change":11,"pos":23408}],"flag":"BLOCK","start":31935,"end":32002,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":23354},"to":{"change":11,"start":23354,"end":23408},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":"fn notify_unknown_changes(unknown_changes: &[crate::remote::CS]) {"}],"del_contents":[{"Del":"fn notify_unknown_changes(unknown_changes: &[Hash]) {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":695,"ins":{"up_context":[{"change":11,"pos":23767}],"down_context":[{"change":11,"pos":23864}],"flag":"BLOCK","start":32003,"end":32246,"inode":{"change":11,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":23767},"to":{"change":11,"start":23767,"end":23864},"introduced_by":11}],"inode":{"change":11,"pos":111631}},"ins_contents":[{"Add":" let hash = match hash {"},{"Add":" CS::Change(hash) => hash.to_base32(),"},{"Add":" CS::State(hash) => hash.to_base32(),"},{"Add":" };"},{"Add":" writeln!(&mut s, \"# {}\", hash).expect(\"Infallible write to String\");"}],"del_contents":[{"Del":" writeln!(&mut s, \"# {}\", hash.to_base32()).expect(\"Infallible write to String\");\n"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":34,"ins":{"up_context":[{"change":11,"pos":124152}],"down_context":[{"change":11,"pos":0}],"flag":"BLOCK","start":32247,"end":32412,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":124152},"to":{"change":8,"start":0,"end":90},"introduced_by":8}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":" static ref TAG: Regex = Regex::new(r#\"^tag\\s+(\\S+)\\s+\"#).unwrap();"},{"Add":" static ref TAGUP: Regex = Regex::new(r#\"^tagup\\s+(\\S+)\\s+(\\S+)\\s+([0-9]+)\\s+\"#).unwrap();"}],"del_contents":[{"Del":" static ref TAG: Regex = Regex::new(r#\"^tag\\s+(\\S+)\\s+(\\S+)\\s+([0-9]+)\\s+\"#).unwrap();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":81,"ins":{"up_context":[{"change":11,"pos":125737}],"down_context":[{"change":11,"pos":15402}],"flag":"BLOCK","start":32413,"end":32518,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":125737},"to":{"change":11,"start":11597,"end":11667},"introduced_by":11}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" for x in txn.log(&*channel.read(), pos)? {"}],"del_contents":[{"Del":" for x in txn.read().log(&*channel.read(), pos)? {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":92,"ins":{"up_context":[{"change":11,"pos":12250}],"down_context":[{"change":11,"pos":1345}],"flag":"BLOCK","start":32519,"end":33017,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":12250},"to":{"change":11,"start":1272,"end":1345},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1272},"to":{"change":11,"start":1272,"end":1345},"introduced_by":11}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":" let m2 = if let Some(x) = txn"},{"Add":" .rev_iter_tags(txn.tags(&*channel.read()), Some(n))?"},{"Add":" .next()"},{"Add":" {"},{"Add":" x?.1.b.into()"},{"Add":" } else {"},{"Add":" Merkle::zero()"},{"Add":" };"},{"Add":" writeln!(o, \"{} {} {}\", n, m.to_base32(), m2.to_base32())?;"}],"del_contents":[{"Del":" writeln!(o, \"{} {}\", n, m.to_base32())?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":105,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":126196},"to":{"change":11,"start":11668,"end":11765},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":11765},"to":{"change":11,"start":15540,"end":15582},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":17836},"to":{"change":11,"start":15540,"end":15582},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15540},"to":{"change":11,"start":15540,"end":15582},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":15582},"to":{"change":11,"start":12251,"end":12297},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":12297},"to":{"change":11,"start":1515,"end":1575},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":15582},"to":{"change":11,"start":1515,"end":1575},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1515},"to":{"change":11,"start":1515,"end":1575},"introduced_by":11}],"inode":{"change":11,"pos":123281}}},"contents":[{"Del":" } else if let Some(x) = txn.read().reverse_log(&*channel.read(), None)?.next() {\n"},{"Del":" let (n, (_, m)) = x?;\n"},{"Del":" let m: Merkle = m.into();\n"},{"Del":" writeln!(o, \"{} {}\", n, m.to_base32())?\n"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":106,"ins":{"up_context":[{"change":11,"pos":126221}],"down_context":[{"change":11,"pos":126476}],"flag":"BLOCK","start":33018,"end":33762,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":126221},"to":{"change":11,"start":1576,"end":1615},"introduced_by":11}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" if let Some(x) = txn.reverse_log(&*channel.read(), None)?.next() {"},{"Add":" let (n, (_, m)) = x?;"},{"Add":" let m: Merkle = m.into();"},{"Add":" let m2 = if let Some(x) = txn"},{"Add":" .rev_iter_tags(txn.tags(&*channel.read()), Some(n))?"},{"Add":" .next()"},{"Add":" {"},{"Add":" x?.1.b.into()"},{"Add":" } else {"},{"Add":" Merkle::zero()"},{"Add":" };"},{"Add":" writeln!(o, \"{} {} {}\", n, m.to_base32(), m2.to_base32())?"},{"Add":" } else {"},{"Add":" writeln!(o, \"-\")?;"},{"Add":" }"}],"del_contents":[{"Del":" writeln!(o, \"-\")?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":150,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":11929}],"down_context":[{"change":11,"pos":11974}],"flag":"BLOCK","start":33763,"end":33990,"inode":{"change":11,"pos":123281}}},"contents":[{"Add":" let tags: Vec = txn"},{"Add":" .iter_tags(txn.tags(&*channel.read()), from)?"},{"Add":" .map(|k| (*k.unwrap().0).into())"},{"Add":" .collect();"},{"Add":" let mut tagsi = 0;"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":166,"ins":{"up_context":[{"change":11,"pos":12631}],"down_context":[{"change":11,"pos":3328}],"flag":"BLOCK","start":33991,"end":34197,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12631},"to":{"change":11,"start":3172,"end":3328},"introduced_by":11}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":" if paths.is_empty() && tags.get(tagsi) == Some(&n) {"},{"Add":" writeln!(o, \"{}.{}.{}.\", n, h.to_base32(), m.to_base32(),)?;"},{"Add":" tagsi += 1;"}],"del_contents":[{"Del":" if txn.is_tagged(&channel.read().tags, n)? {\n writeln!(o, \"{}.{}.{}.\", n, h.to_base32(), m.to_base32())?\n"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":170,"ins":{"up_context":[{"change":11,"pos":3361}],"down_context":[{"change":11,"pos":3447}],"flag":"BLOCK","start":34198,"end":34285,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3361},"to":{"change":11,"start":3361,"end":3447},"introduced_by":11}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":" writeln!(o, \"{}.{}.{}\", n, h.to_base32(), m.to_base32())?;"}],"del_contents":[{"Del":" writeln!(o, \"{}.{}.{}\", n, h.to_base32(), m.to_base32())?\n"}]}},{"Edit":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":178,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":137}],"down_context":[{"change":11,"pos":137}],"flag":"BLOCK","start":34286,"end":34918,"inode":{"change":11,"pos":123281}}},"contents":[{"Add":" let mut tag_path = repo.changes_dir.clone();"},{"Add":" libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &state);"},{"Add":" let mut tag = libpijul::tag::OpenTagFile::open(&tag_path, &state)?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" tag.short(&mut buf)?;"},{"Add":" o.write_u64::(buf.len() as u64)?;"},{"Add":" o.write_all(&buf)?;"},{"Add":" o.flush()?;"},{"Add":" }"},{"Add":" } else if let Some(cap) = TAGUP.captures(&buf) {"},{"Add":" if let Some(state) = Merkle::from_base32(cap[1].as_bytes()) {"}]}},{"Edit":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":192,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":341}],"down_context":[{"change":11,"pos":341}],"flag":"BLOCK","start":34919,"end":35263,"inode":{"change":11,"pos":123281}}},"contents":[{"Add":" let mut tag_path = repo.changes_dir.clone();"},{"Add":" libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &m);"},{"Add":" if std::fs::metadata(&tag_path).is_ok() {"},{"Add":" bail!(\"Tag for state {} already exists\", m.to_base32());"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":209,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":848},"to":{"change":11,"start":848,"end":1162},"introduced_by":11}],"inode":{"change":11,"pos":123281}}},"contents":[{"Del":" let mut tag_path = repo.changes_dir.clone();\n std::fs::create_dir_all(&tag_path)?;\n\n let mut temp_path = tag_path.clone();\n temp_path.push(\"tmp\");\n\n let mut w = std::fs::File::create(&temp_path)?;\n\n"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":213,"ins":{"up_context":[{"change":11,"pos":1332}],"down_context":[{"change":11,"pos":1398}],"flag":"BLOCK","start":35264,"end":35590,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1332},"to":{"change":11,"start":1332,"end":1398},"introduced_by":11}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":" let header = libpijul::tag::read_short(std::io::Cursor::new(&buf[..]), &m)?;"},{"Add":""},{"Add":" let temp_path = tag_path.with_extension(\"tmp\");"},{"Add":""},{"Add":" std::fs::create_dir_all(temp_path.parent().unwrap())?;"},{"Add":" let mut w = std::fs::File::create(&temp_path)?;"}],"del_contents":[{"Del":" let header = bincode::deserialize(&buf)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":220,"ins":{"up_context":[{"change":11,"pos":1492}],"down_context":[{"change":11,"pos":1667}],"flag":"BLOCK","start":35591,"end":35592,"inode":{"change":11,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1492},"to":{"change":11,"start":1492,"end":1667},"introduced_by":11}],"inode":{"change":11,"pos":123281}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &m);\n std::fs::create_dir_all(tag_path.parent().unwrap())?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":151,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":204}],"down_context":[{"change":11,"pos":2970}],"flag":"BLOCK","start":35593,"end":35617,"inode":{"change":11,"pos":133619}}},"contents":[{"Add":""},{"Add":"use crate::remote::CS;"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":158,"ins":{"up_context":[{"change":11,"pos":3136}],"down_context":[{"change":11,"pos":3169}],"flag":"BLOCK","start":35618,"end":35639,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3136},"to":{"change":11,"start":3136,"end":3169},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":" pullable: &[CS],"}],"del_contents":[{"Del":" pullable: &[libpijul::Hash],\n"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":180,"ins":{"up_context":[{"change":11,"pos":3733}],"down_context":[{"change":11,"pos":4003}],"flag":"BLOCK","start":35640,"end":36292,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3733},"to":{"change":11,"start":3733,"end":4003},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":" let header = match p {"},{"Add":" CS::Change(p) => {"},{"Add":" writeln!(v, \"{}\\n\", p.to_base32()).unwrap();"},{"Add":" let deps = changes.get_dependencies(&p)?;"},{"Add":" if !deps.is_empty() {"},{"Add":" write!(v, \" Dependencies:\").unwrap();"},{"Add":" for d in deps {"},{"Add":" write!(v, \" {}\", d.to_base32()).unwrap();"},{"Add":" }"},{"Add":" writeln!(v).unwrap();"},{"Add":" }"},{"Add":" changes.get_header(&p)?"},{"Add":" }"},{"Add":" CS::State(p) => {"},{"Add":" writeln!(v, \"t{}\\n\", p.to_base32()).unwrap();"},{"Add":" changes.get_tag_header(&p)?"}],"del_contents":[{"Del":" writeln!(v, \"{}\\n\", p.to_base32()).unwrap();\n let deps = changes.get_dependencies(&p)?;\n if !deps.is_empty() {\n write!(v, \" Dependencies:\").unwrap();\n for d in deps {\n write!(v, \" {}\", d.to_base32()).unwrap();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":197,"ins":{"up_context":[{"change":11,"pos":4017}],"down_context":[{"change":11,"pos":4107}],"flag":"BLOCK","start":36293,"end":36304,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4017},"to":{"change":11,"start":4017,"end":4107},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":" };"}],"del_contents":[{"Del":" writeln!(v).unwrap();\n }\n let change = changes.get_header(&p)?;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":200,"ins":{"up_context":[{"change":11,"pos":4180}],"down_context":[{"change":11,"pos":4221}],"flag":"BLOCK","start":36305,"end":36346,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4180},"to":{"change":11,"start":4180,"end":4221},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":" for a in header.authors.iter() {"}],"del_contents":[{"Del":" for a in change.authors.iter() {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":212,"ins":{"up_context":[{"change":11,"pos":4414}],"down_context":[{"change":11,"pos":4520}],"flag":"BLOCK","start":36347,"end":36453,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4414},"to":{"change":11,"start":4414,"end":4520},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":" writeln!(v, \" Date: {}\\n\", header.timestamp).unwrap();"},{"Add":" for l in header.message.lines() {"}],"del_contents":[{"Del":" writeln!(v, \" Date: {}\\n\", change.timestamp).unwrap();\n for l in change.message.lines() {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":216,"ins":{"up_context":[{"change":11,"pos":4577}],"down_context":[{"change":11,"pos":4626}],"flag":"BLOCK","start":36454,"end":36503,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4577},"to":{"change":11,"start":4577,"end":4626},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":" if let Some(desc) = header.description {"}],"del_contents":[{"Del":" if let Some(desc) = change.description {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":229,"ins":{"up_context":[{"change":11,"pos":4940}],"down_context":[{"change":11,"pos":4995}],"flag":"BLOCK","start":36504,"end":36562,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4940},"to":{"change":11,"start":4940,"end":4995},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":"fn parse_changelist(o: &[u8]) -> Vec {"}],"del_contents":[{"Del":"fn parse_changelist(o: &[u8]) -> Vec {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":133619},"path":"pijul/src/commands/mod.rs","line":233,"ins":{"up_context":[{"change":11,"pos":5083}],"down_context":[{"change":11,"pos":5154}],"flag":"BLOCK","start":36563,"end":37058,"inode":{"change":11,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":5083},"to":{"change":11,"start":5083,"end":5154},"introduced_by":11}],"inode":{"change":11,"pos":133619}},"ins_contents":[{"Add":" .filter_map(|l| {"},{"Add":" ::log::debug!("},{"Add":" \"l = {:?} {:?}\","},{"Add":" l,"},{"Add":" libpijul::Merkle::from_base32(l.as_bytes())"},{"Add":" );"},{"Add":" if l.starts_with(\"t\") {"},{"Add":" libpijul::Merkle::from_base32(&l.as_bytes()[1..]).map(crate::remote::CS::State)"},{"Add":" } else {"},{"Add":" libpijul::Hash::from_base32(l.as_bytes()).map(crate::remote::CS::Change)"},{"Add":" }"},{"Add":" })"}],"del_contents":[{"Del":" .filter_map(|l| libpijul::Hash::from_base32(l.as_bytes()))\n"}]}},{"Edit":{"inode":{"change":11,"pos":6397},"path":"libpijul/src/tag.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":103,"pos":1742}],"down_context":[{"change":11,"pos":8014}],"flag":"BLOCK","start":37059,"end":38699,"inode":{"change":11,"pos":6397}}},"contents":[{"Add":""},{"Add":" pub fn short(&mut self, mut w: W) -> Result<(), TagError> {"},{"Add":" let mut header_buf = vec![0u8; (self.header.channel - self.header.header) as usize];"},{"Add":""},{"Add":" self.file.seek(SeekFrom::Start(self.header.header))?;"},{"Add":" self.file.read_exact(&mut header_buf)?;"},{"Add":" debug!(\"header_buf = {:?}\", header_buf);"},{"Add":" let mut off = FileHeader {"},{"Add":" version: VERSION,"},{"Add":" header: 0,"},{"Add":" channel: 0,"},{"Add":" unhashed: 0,"},{"Add":" total: 0,"},{"Add":" offsets: DbOffsets::default(),"},{"Add":" state: self.header.state.clone(),"},{"Add":" };"},{"Add":" off.header = bincode::serialized_size(&off)?;"},{"Add":" off.channel = off.header + header_buf.len() as u64;"},{"Add":" off.total = off.channel;"},{"Add":" let mut off_buf = Vec::with_capacity(off.header as usize);"},{"Add":" bincode::serialize_into(&mut off_buf, &off)?;"},{"Add":" w.write_all(&off_buf)?;"},{"Add":" w.write_all(&header_buf)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn read_short(mut file: R, expected: &Merkle) -> Result {"},{"Add":" let mut off = [0u8; std::mem::size_of::() as usize];"},{"Add":" file.seek(SeekFrom::Start(0))?;"},{"Add":" file.read_exact(&mut off)?;"},{"Add":" let header: FileHeader = bincode::deserialize(&off).map_err(TagError::BincodeDe)?;"},{"Add":" debug!(\"header = {:?}\", header);"},{"Add":" if &header.state == expected {"},{"Add":" file.seek(SeekFrom::Start(header.header))?;"},{"Add":" Ok(bincode::deserialize_from(file).map_err(TagError::BincodeDe)?)"},{"Add":" } else {"},{"Add":" Err(TagError::WrongHash {"},{"Add":" expected: *expected,"},{"Add":" got: header.state,"},{"Add":" })"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":11,"pos":6397},"path":"libpijul/src/tag.rs","line":520,"ins":{"up_context":[{"change":11,"pos":19425}],"down_context":[{"change":11,"pos":19497}],"flag":"BLOCK","start":38700,"end":38851,"inode":{"change":11,"pos":6397}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":19425},"to":{"change":10,"start":0,"end":124},"introduced_by":10}],"inode":{"change":11,"pos":6397}},"ins_contents":[{"Add":" debug!(\"copying tags\");"},{"Add":" let tags = copy::, P>, _>("}],"del_contents":[{"Del":" let tags = copy::, UP>, _>(\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":227,"ins":{"up_context":[{"change":11,"pos":6778}],"down_context":[{"change":11,"pos":6952}],"flag":"BLOCK","start":38852,"end":38928,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6778},"to":{"change":11,"start":6778,"end":6952},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" type Changeset = u64;"},{"Add":" type RevChangeset = u64;"},{"Add":" type Tags = u64;"}],"del_contents":[{"Del":" type Changeset = u64; // Db;\n type RevChangeset = u64; // UDb>;\n type Tags = u64; // UDb;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":231,"ins":{"up_context":[{"change":11,"pos":6953}],"down_context":[{"change":11,"pos":7007}],"flag":"BLOCK","start":38929,"end":38952,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6953},"to":{"change":11,"start":6953,"end":7007},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" type States = u64;"}],"del_contents":[{"Del":" type States = u64; // UDb;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":406,"ins":{"up_context":[{"change":11,"pos":2335}],"down_context":[{"change":11,"pos":2400}],"flag":"BLOCK","start":38953,"end":39094,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2335},"to":{"change":11,"start":2335,"end":2400},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" ::sanakirja::btree::cursor::Cursor, P>>;"}],"del_contents":[{"Del":" ::sanakirja::btree::cursor::Cursor>;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":410,"ins":{"up_context":[{"change":11,"pos":2540}],"down_context":[{"change":11,"pos":2592}],"flag":"BLOCK","start":39095,"end":39185,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2540},"to":{"change":11,"start":2540,"end":2592},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" let db: Db> = Db::from_page(*tags);"}],"del_contents":[{"Del":" let db: Db = Db::from_page(*tags);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":423,"ins":{"up_context":[{"change":11,"pos":13339}],"down_context":[{"change":11,"pos":13429}],"flag":"BLOCK","start":39186,"end":39302,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":13339},"to":{"change":11,"start":2754,"end":2832},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" crate::pristine::Cursor>,"}],"del_contents":[{"Del":" crate::pristine::Cursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":427,"ins":{"up_context":[{"change":11,"pos":2877}],"down_context":[{"change":11,"pos":13585}],"flag":"BLOCK","start":39303,"end":39396,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2877},"to":{"change":11,"start":2877,"end":2932},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" let db: Db> = Db::from_page(*channel);"}],"del_contents":[{"Del":" let db: Db = Db::from_page(*channel);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":443,"ins":{"up_context":[{"change":11,"pos":14025}],"down_context":[{"change":11,"pos":14102}],"flag":"BLOCK","start":39397,"end":39500,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14025},"to":{"change":11,"start":2933,"end":2991},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":445,"ins":{"up_context":[{"change":11,"pos":14145}],"down_context":[{"change":11,"pos":14163}],"flag":"BLOCK","start":39501,"end":39519,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14145},"to":{"change":11,"start":2992,"end":3026},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" Ok(x)"}],"del_contents":[{"Del":" Ok(x.map(|(a, _)| a))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":454,"ins":{"up_context":[{"change":11,"pos":14340}],"down_context":[{"change":11,"pos":14417}],"flag":"BLOCK","start":39520,"end":39623,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14340},"to":{"change":11,"start":3027,"end":3085},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":456,"ins":{"up_context":[{"change":11,"pos":14460}],"down_context":[{"change":11,"pos":14478}],"flag":"BLOCK","start":39624,"end":39642,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14460},"to":{"change":11,"start":3086,"end":3120},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" Ok(x)"}],"del_contents":[{"Del":" Ok(x.map(|(a, _)| a))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":467,"ins":{"up_context":[{"change":11,"pos":14675}],"down_context":[{"change":11,"pos":14760}],"flag":"BLOCK","start":39643,"end":39754,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14675},"to":{"change":11,"start":3121,"end":3194},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" crate::pristine::Cursor>,"}],"del_contents":[{"Del":" crate::pristine::Cursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":478,"ins":{"up_context":[{"change":11,"pos":14973}],"down_context":[{"change":11,"pos":15061}],"flag":"BLOCK","start":39755,"end":39869,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":14973},"to":{"change":11,"start":3195,"end":3271},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" crate::pristine::RevCursor>,"}],"del_contents":[{"Del":" crate::pristine::RevCursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":482,"ins":{"up_context":[{"change":11,"pos":3316}],"down_context":[{"change":11,"pos":15217}],"flag":"BLOCK","start":39870,"end":39963,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3316},"to":{"change":11,"start":3316,"end":3371},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" let db: Db> = Db::from_page(*channel);"}],"del_contents":[{"Del":" let db: Db = Db::from_page(*channel);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":752,"ins":{"up_context":[{"change":11,"pos":23017}],"down_context":[{"change":11,"pos":23107}],"flag":"BLOCK","start":39964,"end":40080,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":23017},"to":{"change":11,"start":3511,"end":3589},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" crate::pristine::Cursor>,"}],"del_contents":[{"Del":" crate::pristine::Cursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":760,"ins":{"up_context":[{"change":11,"pos":23298}],"down_context":[{"change":11,"pos":23375}],"flag":"BLOCK","start":40081,"end":40184,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":23298},"to":{"change":11,"start":3590,"end":3648},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":767,"ins":{"up_context":[{"change":11,"pos":23503}],"down_context":[{"change":11,"pos":23580}],"flag":"BLOCK","start":40185,"end":40288,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":23503},"to":{"change":11,"start":3649,"end":3707},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":776,"ins":{"up_context":[{"change":11,"pos":23728}],"down_context":[{"change":11,"pos":23813}],"flag":"BLOCK","start":40289,"end":40400,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":23728},"to":{"change":11,"start":3708,"end":3781},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" crate::pristine::Cursor>,"}],"del_contents":[{"Del":" crate::pristine::Cursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":48},"path":"libpijul/src/tag/txn.rs","line":787,"ins":{"up_context":[{"change":11,"pos":24038}],"down_context":[{"change":11,"pos":24126}],"flag":"BLOCK","start":40401,"end":40515,"inode":{"change":11,"pos":48}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":24038},"to":{"change":11,"start":3782,"end":3858},"introduced_by":11}],"inode":{"change":11,"pos":48}},"ins_contents":[{"Add":" crate::pristine::RevCursor>,"}],"del_contents":[{"Del":" crate::pristine::RevCursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":947,"ins":{"up_context":[{"change":11,"pos":23676}],"down_context":[{"change":11,"pos":23766}],"flag":"BLOCK","start":40516,"end":40632,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":23676},"to":{"change":11,"start":4233,"end":4311},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" crate::pristine::Cursor>,"}],"del_contents":[{"Del":" crate::pristine::Cursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":965,"ins":{"up_context":[{"change":11,"pos":24249}],"down_context":[{"change":11,"pos":24326}],"flag":"BLOCK","start":40633,"end":40736,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":24249},"to":{"change":11,"start":4312,"end":4370},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":967,"ins":{"up_context":[{"change":11,"pos":24374}],"down_context":[{"change":11,"pos":24392}],"flag":"BLOCK","start":40737,"end":40755,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":24374},"to":{"change":11,"start":4371,"end":4405},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" Ok(x)"}],"del_contents":[{"Del":" Ok(x.map(|(a, _)| a))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":976,"ins":{"up_context":[{"change":11,"pos":24562}],"down_context":[{"change":11,"pos":24639}],"flag":"BLOCK","start":40756,"end":40859,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":24562},"to":{"change":11,"start":4406,"end":4464},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr> {"}],"del_contents":[{"Del":" ) -> Result, TxnErr> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":978,"ins":{"up_context":[{"change":11,"pos":24687}],"down_context":[{"change":11,"pos":24705}],"flag":"BLOCK","start":40860,"end":40878,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":24687},"to":{"change":11,"start":4465,"end":4499},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" Ok(x)"}],"del_contents":[{"Del":" Ok(x.map(|(a, _)| a))\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":988,"ins":{"up_context":[{"change":11,"pos":2167}],"down_context":[{"change":9,"pos":906}],"flag":"BLOCK","start":40879,"end":41014,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2167},"to":{"change":9,"start":809,"end":906},"introduced_by":9}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" ) -> Result>, TxnErr>"}],"del_contents":[{"Del":" ) -> Result, TxnErr>\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":997,"ins":{"up_context":[{"change":11,"pos":2455}],"down_context":[{"change":9,"pos":1013}],"flag":"BLOCK","start":41015,"end":41153,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2455},"to":{"change":9,"start":913,"end":1013},"introduced_by":9}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" ) -> Result>, TxnErr>"}],"del_contents":[{"Del":" ) -> Result, TxnErr>\n"}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1231,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":549083}],"down_context":[{"change":11,"pos":45839}],"flag":"BLOCK","start":41154,"end":42565,"inode":{"change":11,"pos":531056}}},"contents":[{"Add":" fn state_from_prefix("},{"Add":" &self,"},{"Add":" channel: &Self::Channel,"},{"Add":" s: &str,"},{"Add":" ) -> Result<(Merkle, L64), super::HashPrefixError> {"},{"Add":" let h: SerializedMerkle = if let Some(ref h) = Merkle::from_prefix(s) {"},{"Add":" h.into()"},{"Add":" } else {"},{"Add":" return Err(super::HashPrefixError::Parse(s.to_string()));"},{"Add":" };"},{"Add":" let mut result = None;"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" for x in btree::iter(&self.txn, &channel.states, Some((&h, None)))"},{"Add":" .map_err(|e| super::HashPrefixError::Txn(e.into()))?"},{"Add":" {"},{"Add":" let (e, i) = x.map_err(|e| super::HashPrefixError::Txn(e.into()))?;"},{"Add":" debug!(\"{:?} {:?}\", e, i);"},{"Add":" if e < &h {"},{"Add":" continue;"},{"Add":" } else {"},{"Add":" let e: Merkle = e.into();"},{"Add":" let b32 = e.to_base32();"},{"Add":" debug!(\"{:?}\", b32);"},{"Add":" let (b32, _) = b32.split_at(s.len().min(b32.len()));"},{"Add":" if b32 != s {"},{"Add":" break;"},{"Add":" } else if result.is_none() {"},{"Add":" result = Some((e, *i))"},{"Add":" } else {"},{"Add":" return Err(super::HashPrefixError::Ambiguous(s.to_string()));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if let Some(result) = result {"},{"Add":" Ok(result)"},{"Add":" } else {"},{"Add":" Err(super::HashPrefixError::NotFound(s.to_string()))"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1431,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":554746},"to":{"change":9,"start":1095,"end":1457},"introduced_by":9}],"inode":{"change":11,"pos":531056}}},"contents":[{"Del":" sanakirja_cursor!(remotetags, L64, Pair);\n sanakirja_rev_cursor!(remotetags, L64, Pair);\n type RemotetagsCursor = ::sanakirja::btree::cursor::Cursor<\n L64,\n Pair,\n UP>,\n >;\n\n"}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1498,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":81489}],"down_context":[{"change":11,"pos":81489}],"flag":"BLOCK","start":42566,"end":42611,"inode":{"change":11,"pos":531056}}},"contents":[{"Add":" debug!(\"last_remote: {:?}\", remote);"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1509,"ins":{"up_context":[{"change":9,"pos":1497}],"down_context":[{"change":9,"pos":1532}],"flag":"BLOCK","start":42612,"end":42641,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":1497},"to":{"change":9,"start":1497,"end":1532},"introduced_by":9}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" remote: &Self::Tags,"}],"del_contents":[{"Del":" remote: &Self::Remotetags,\n"}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1533,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":49322}],"down_context":[{"change":11,"pos":556591}],"flag":"BLOCK","start":42642,"end":43066,"inode":{"change":11,"pos":531056}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" fn get_remote_tag("},{"Add":" &self,"},{"Add":" remote: &Self::Tags,"},{"Add":" n: u64,"},{"Add":" ) -> Result)>, TxnErr>"},{"Add":" {"},{"Add":" let n = n.into();"},{"Add":" if let Some(x) = btree::rev_iter(&self.txn, remote, Some((&n, None)))?.next() {"},{"Add":" let (&k, m) = x?;"},{"Add":" Ok(Some((k.into(), m)))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1564,"ins":{"up_context":[{"change":11,"pos":82186}],"down_context":[{"change":11,"pos":98958}],"flag":"BLOCK","start":43067,"end":43124,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":82186},"to":{"change":11,"start":49635,"end":49685},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":49635},"to":{"change":11,"start":49635,"end":49685},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" ) -> Result, TxnErr> {"}],"del_contents":[{"Del":" ) -> Result> {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1566,"ins":{"up_context":[{"change":11,"pos":99032}],"down_context":[{"change":11,"pos":82338}],"flag":"BLOCK","start":43125,"end":43213,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":63625},"to":{"change":11,"start":82263,"end":82311},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":99032},"to":{"change":11,"start":82263,"end":82311},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82263},"to":{"change":11,"start":82263,"end":82311},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82311},"to":{"change":11,"start":10272,"end":10300},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" Some((k, v)) if k == m => Ok(Some((*v).into())),"},{"Add":" _ => Ok(None),"}],"del_contents":[{"Del":" Some((k, _)) if k == m => Ok(true),\n"},{"Del":" _ => Ok(false),\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1856,"ins":{"up_context":[{"change":9,"pos":3270}],"down_context":[{"change":9,"pos":3318}],"flag":"BLOCK","start":43214,"end":43259,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3270},"to":{"change":9,"start":3270,"end":3318},"introduced_by":9}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" debug!(\"del_tags {:?} {:?}\", t_, p);"}],"del_contents":[{"Del":" debug!(\"del_changes {:?} {:?}\", t_, p);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1904,"ins":{"up_context":[{"change":11,"pos":562292}],"down_context":[{"change":9,"pos":3542}],"flag":"BLOCK","start":43260,"end":43287,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":562292},"to":{"change":11,"start":3610,"end":3643},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" v: (Hash, Merkle),"}],"del_contents":[{"Del":" v: (Hash, Merkle, bool),\n"}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1915,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":85930}],"down_context":[{"change":11,"pos":85930}],"flag":"BLOCK","start":43288,"end":43352,"inode":{"change":11,"pos":531056}}},"contents":[{"Add":" debug!(\"remote.remote after put: {:?}\", remote.remote);"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1917,"ins":{"up_context":[{"change":11,"pos":86001}],"down_context":[{"change":11,"pos":86001}],"flag":"BLOCK","start":43353,"end":43444,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":86001},"to":{"change":11,"start":3644,"end":3661},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3661},"to":{"change":9,"start":3593,"end":3648},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":9,"pos":3648},"to":{"change":11,"start":3735,"end":3745},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3735},"to":{"change":11,"start":3735,"end":3745},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" // if v.2 {"},{"Add":" // self.put_tags(&mut remote.tags, k, &v.1)?;"},{"Add":" // }"}],"del_contents":[{"Del":" if v.2 {\n"},{"Del":" self.put_tags(&mut remote.tags, k, &v.1)?;\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2369,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":32833}],"down_context":[{"change":11,"pos":32833}],"flag":"BLOCK","start":43445,"end":43482,"inode":{"change":11,"pos":531056}}},"contents":[{"Add":" _tags: r.tags.db.into(),"}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2518,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":33344}],"down_context":[{"change":11,"pos":33344}],"flag":"BLOCK","start":43483,"end":43514,"inode":{"change":11,"pos":531056}}},"contents":[{"Add":""},{"Add":"const REMOTE_LEN: usize = 40;"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2525,"ins":{"up_context":[{"change":11,"pos":33448}],"down_context":[{"change":11,"pos":33477}],"flag":"BLOCK","start":43515,"end":43556,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33448},"to":{"change":11,"start":33448,"end":33477},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" REMOTE_LEN + 1 + self.path.len()"}],"del_contents":[{"Del":" 33 + self.path.len()\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2528,"ins":{"up_context":[{"change":11,"pos":33534}],"down_context":[{"change":11,"pos":33569}],"flag":"BLOCK","start":43557,"end":43612,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33534},"to":{"change":11,"start":33534,"end":33569},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" REMOTE_LEN + 1 + (*p.add(REMOTE_LEN)) as usize"}],"del_contents":[{"Del":" 33 + (*p.add(32)) as usize\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2531,"ins":{"up_context":[{"change":11,"pos":33644}],"down_context":[{"change":11,"pos":33683}],"flag":"BLOCK","start":43613,"end":43660,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33644},"to":{"change":11,"start":33644,"end":33683},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" let len = *p.add(REMOTE_LEN) as usize;"}],"del_contents":[{"Del":" let len = *p.add(32) as usize;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2540,"ins":{"up_context":[{"change":11,"pos":33957}],"down_context":[{"change":11,"pos":33991}],"flag":"BLOCK","start":43661,"end":43707,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33957},"to":{"change":11,"start":33957,"end":33991},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" REMOTE_LEN + 1 + self.path.len(),"}],"del_contents":[{"Del":" 33 + self.path.len(),\n"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2544,"ins":{"up_context":[{"change":11,"pos":34053}],"down_context":[{"change":11,"pos":34117}],"flag":"BLOCK","start":43708,"end":43784,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":34053},"to":{"change":11,"start":34053,"end":34117},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" std::slice::from_raw_parts(p, REMOTE_LEN + 1 + self.path.len())"}],"del_contents":[{"Del":" std::slice::from_raw_parts(p, 33 + self.path.len())\n"}]}},{"Edit":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2555,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":34254}],"down_context":[{"change":11,"pos":34254}],"flag":"BLOCK","start":43785,"end":43801,"inode":{"change":11,"pos":531056}}},"contents":[{"Add":" _tags: L64,"}]}},{"Replacement":{"inode":{"change":11,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2562,"ins":{"up_context":[{"change":11,"pos":34405}],"down_context":[{"change":11,"pos":34455}],"flag":"BLOCK","start":43802,"end":43864,"inode":{"change":11,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":34405},"to":{"change":11,"start":34405,"end":34455},"introduced_by":11}],"inode":{"change":11,"pos":531056}},"ins_contents":[{"Add":" let len = REMOTE_LEN + 1 + self._path.len() as usize;"}],"del_contents":[{"Del":" let len = 33 + self._path.len() as usize;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":257,"ins":{"up_context":[{"change":11,"pos":35468}],"down_context":[{"change":11,"pos":35536}],"flag":"BLOCK","start":43865,"end":43926,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":35468},"to":{"change":11,"start":35468,"end":35536},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":"#[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]"}],"del_contents":[{"Del":"#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]\n"}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":292,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":36263}],"down_context":[{"change":11,"pos":36263}],"flag":"BLOCK","start":43927,"end":44114,"inode":{"change":11,"pos":586748}}},"contents":[{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" write!(fmt, \"{}\", data_encoding::BASE32_NOPAD.encode(&self.0))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::fmt::Debug for RemoteId {"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":467,"ins":{"up_context":[{"change":11,"pos":26829}],"down_context":[{"change":11,"pos":26919}],"flag":"BLOCK","start":44115,"end":44231,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":26829},"to":{"change":11,"start":5033,"end":5111},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" crate::pristine::Cursor>,"}],"del_contents":[{"Del":" crate::pristine::Cursor,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":474,"ins":{"up_context":[{"change":11,"pos":27039}],"down_context":[{"change":11,"pos":27115}],"flag":"BLOCK","start":44232,"end":44334,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":27039},"to":{"change":11,"start":5112,"end":5169},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr>;"}],"del_contents":[{"Del":" ) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":479,"ins":{"up_context":[{"change":11,"pos":27195}],"down_context":[{"change":11,"pos":3106}],"flag":"BLOCK","start":44335,"end":44437,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":27195},"to":{"change":11,"start":5170,"end":5227},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" ) -> Result)>, TxnErr>;"}],"del_contents":[{"Del":" ) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":485,"ins":{"up_context":[{"change":11,"pos":3189}],"down_context":[{"change":11,"pos":3315}],"flag":"BLOCK","start":44438,"end":44567,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3189},"to":{"change":11,"start":5228,"end":5319},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" ) -> Result>, TxnErr>;"}],"del_contents":[{"Del":" ) -> Result, TxnErr>;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":492,"ins":{"up_context":[{"change":11,"pos":3427}],"down_context":[{"change":11,"pos":3498}],"flag":"BLOCK","start":44568,"end":44665,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":3427},"to":{"change":11,"start":5320,"end":5379},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" RevCursor>,"}],"del_contents":[{"Del":" RevCursor,\n"}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":652,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":58422}],"down_context":[{"change":11,"pos":591226}],"flag":"BLOCK","start":44666,"end":44826,"inode":{"change":11,"pos":586748}}},"contents":[{"Add":""},{"Add":" fn state_from_prefix("},{"Add":" &self,"},{"Add":" channel: &Self::Channel,"},{"Add":" s: &str,"},{"Add":" ) -> Result<(Merkle, L64), HashPrefixError>;"},{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":695,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":103300},"to":{"change":9,"start":3725,"end":3873},"introduced_by":9}],"inode":{"change":11,"pos":586748}}},"contents":[{"Del":" cursor!(remotetags, L64, Pair);\n rev_cursor!(remotetags, L64, Pair);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":732,"ins":{"up_context":[{"change":9,"pos":3913}],"down_context":[{"change":9,"pos":3948}],"flag":"BLOCK","start":44827,"end":44856,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":3913},"to":{"change":9,"start":3913,"end":3948},"introduced_by":9}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" remote: &Self::Tags,"}],"del_contents":[{"Del":" remote: &Self::Remotetags,\n"}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":735,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":4045}],"down_context":[{"change":11,"pos":59531}],"flag":"BLOCK","start":44857,"end":44913,"inode":{"change":11,"pos":586748}}},"contents":[{"Add":" /// Find the last state greater than or equal to n."}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":741,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":103728}],"down_context":[{"change":11,"pos":965}],"flag":"BLOCK","start":44914,"end":45181,"inode":{"change":11,"pos":586748}}},"contents":[{"Add":""},{"Add":" /// Find the last tag less than or equal to n (opposite of get_remote_state)."},{"Add":" fn get_remote_tag("},{"Add":" &self,"},{"Add":" remote: &Self::Tags,"},{"Add":" n: u64,"},{"Add":" ) -> Result)>, TxnErr>;"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":758,"ins":{"up_context":[{"change":11,"pos":103794}],"down_context":[{"change":11,"pos":7533}],"flag":"BLOCK","start":45182,"end":45238,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":103794},"to":{"change":11,"start":60067,"end":60116},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":60067},"to":{"change":11,"start":60067,"end":60116},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" ) -> Result, TxnErr>;"}],"del_contents":[{"Del":" ) -> Result>;\n"}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1487,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":68035}],"down_context":[{"change":11,"pos":22252}],"flag":"BLOCK","start":45239,"end":45441,"inode":{"change":11,"pos":586748}}},"contents":[{"Add":"initialized_cursor!(tags, L64, Pair, ChannelTxnT, GraphError);"},{"Add":"initialized_rev_cursor!(tags, L64, Pair, ChannelTxnT, GraphError);"}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1532,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":22745},"to":{"change":11,"start":5380,"end":5769},"introduced_by":11}],"inode":{"change":11,"pos":586748}}},"contents":[{"Del":"\nimpl<'a, T: ChannelTxnT> Iterator for crate::pristine::RevCursor\n{\n type Item = Result<&'a L64, TxnErr>;\n fn next(&mut self) -> Option {\n match self.txn.cursor_tags_prev(&mut self.cursor) {\n Ok(Some(x)) => Some(Ok(x)),\n Ok(None) => None,\n Err(e) => Some(Err(e)),\n }\n }\n}\n"}]}},{"Edit":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1533,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":5770},"to":{"change":11,"start":5770,"end":6520},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1515},"to":{"change":11,"start":621548,"end":621549},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":3690},"to":{"change":11,"start":621548,"end":621549},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":6520},"to":{"change":11,"start":621548,"end":621549},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":68729},"to":{"change":11,"start":621548,"end":621549},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":621548},"to":{"change":11,"start":621548,"end":621549},"introduced_by":11}],"inode":{"change":11,"pos":586748}}},"contents":[{"Del":"impl<'a, T: ChannelTxnT>\n crate::pristine::Cursor\n{\n pub fn prev(&mut self) -> Option>> {\n match self.txn.cursor_tags_prev(&mut self.cursor) {\n Ok(Some(x)) => Some(Ok((*x).into())),\n Ok(None) => None,\n Err(e) => Some(Err(e)),\n }\n }\n}\n\nimpl<'a, T: ChannelTxnT> Iterator for crate::pristine::Cursor\n{\n type Item = Result>;\n fn next(&mut self) -> Option {\n match self.txn.cursor_tags_next(&mut self.cursor) {\n Ok(Some(x)) => Some(Ok((*x).into())),\n Ok(None) => None,\n Err(e) => Some(Err(e)),\n }\n }\n}\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":11,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1868,"ins":{"up_context":[{"change":11,"pos":638332}],"down_context":[{"change":9,"pos":4168}],"flag":"BLOCK","start":45442,"end":45469,"inode":{"change":11,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":638332},"to":{"change":11,"start":3929,"end":3962},"introduced_by":11}],"inode":{"change":11,"pos":586748}},"ins_contents":[{"Add":" v: (Hash, Merkle),"}],"del_contents":[{"Del":" v: (Hash, Merkle, bool),\n"}]}},{"Edit":{"inode":{"change":11,"pos":638683},"path":"libpijul/src/pristine/merkle.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":638816}],"down_context":[{"change":11,"pos":638816}],"flag":"BLOCK","start":45470,"end":45514,"inode":{"change":11,"pos":638683}}},"contents":[{"Add":""},{"Add":"pub(crate) const BASE32_BYTES: usize = 53;"}]}},{"Edit":{"inode":{"change":11,"pos":638683},"path":"libpijul/src/pristine/merkle.rs","line":31,"atom":{"NewVertex":{"up_context":[{"change":104,"pos":9}],"down_context":[{"change":104,"pos":9}],"flag":"BLOCK","start":45515,"end":45675,"inode":{"change":11,"pos":638683}}},"contents":[{"Add":"impl std::fmt::Debug for SerializedMerkle {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" Merkle::from(self).fmt(fmt)"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":638683},"path":"libpijul/src/pristine/merkle.rs","line":96,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":639957}],"down_context":[{"change":11,"pos":639957}],"flag":"BLOCK","start":45676,"end":45848,"inode":{"change":11,"pos":638683}}},"contents":[{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn from_prefix(s: &str) -> Option {"},{"Add":" let mut b32 = [b'A'; BASE32_BYTES];"},{"Add":" if s.len() > BASE32_BYTES {"},{"Add":" return None;"}]}},{"Edit":{"inode":{"change":11,"pos":638683},"path":"libpijul/src/pristine/merkle.rs","line":104,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":639967}],"down_context":[{"change":11,"pos":639967}],"flag":"BLOCK","start":45849,"end":46204,"inode":{"change":11,"pos":638683}}},"contents":[{"Add":" (&mut b32[..s.len()]).clone_from_slice(s.as_bytes());"},{"Add":" let bytes = if let Ok(bytes) = data_encoding::BASE32_NOPAD.decode(&b32) {"},{"Add":" bytes"},{"Add":" } else {"},{"Add":" return None;"},{"Add":" };"},{"Add":" curve25519_dalek::edwards::CompressedEdwardsY::from_slice(&bytes[..32])"},{"Add":" .decompress()"},{"Add":" .map(Merkle::Ed25519)"}]}},{"Replacement":{"inode":{"change":11,"pos":638683},"path":"libpijul/src/pristine/merkle.rs","line":156,"ins":{"up_context":[{"change":11,"pos":112517}],"down_context":[{"change":11,"pos":112573}],"flag":"BLOCK","start":46205,"end":46260,"inode":{"change":11,"pos":638683}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":112517},"to":{"change":11,"start":101552,"end":101614},"introduced_by":11}],"inode":{"change":11,"pos":638683}},"ins_contents":[{"Add":"#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]"}],"del_contents":[{"Del":"#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]\n"}]}},{"Edit":{"inode":{"change":11,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":39,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":818398}],"down_context":[{"change":11,"pos":818398}],"flag":"BLOCK","start":46261,"end":46347,"inode":{"change":11,"pos":817216}}},"contents":[{"Add":" fn get_tag_header(&self, h: &crate::Merkle) -> Result;"}]}},{"Replacement":{"inode":{"change":11,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":2,"ins":{"up_context":[{"change":11,"pos":820772}],"down_context":[{"change":11,"pos":820799}],"flag":"BLOCK","start":46348,"end":46391,"inode":{"change":11,"pos":820702}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":820772},"to":{"change":11,"start":820772,"end":820799},"introduced_by":11}],"inode":{"change":11,"pos":820702}},"ins_contents":[{"Add":"use crate::change::{Change, ChangeHeader};"}],"del_contents":[{"Del":"use crate::change::Change;\n"}]}},{"Edit":{"inode":{"change":11,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":821071}],"down_context":[{"change":11,"pos":821071}],"flag":"BLOCK","start":46392,"end":46453,"inode":{"change":11,"pos":820702}}},"contents":[{"Add":" tags: Arc>>,"}]}},{"Edit":{"inode":{"change":11,"pos":820702},"path":"libpijul/src/changestore/memory.rs","line":41,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":821445}],"down_context":[{"change":11,"pos":821445}],"flag":"BLOCK","start":46454,"end":46643,"inode":{"change":11,"pos":820702}}},"contents":[{"Add":""},{"Add":" fn get_tag_header(&self, h: &crate::Merkle) -> Result {"},{"Add":" let changes = self.tags.read().unwrap();"},{"Add":" Ok(changes.get(&h).unwrap().clone())"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":33,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":35449}],"down_context":[{"change":11,"pos":824519}],"flag":"BLOCK","start":46644,"end":46709,"inode":{"change":11,"pos":824013}}},"contents":[{"Add":" #[error(transparent)]"},{"Add":" Tag(#[from] crate::tag::TagError),"}]}},{"Edit":{"inode":{"change":11,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":62,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":825005}],"down_context":[{"change":11,"pos":825005}],"flag":"BLOCK","start":46710,"end":46882,"inode":{"change":11,"pos":824013}}},"contents":[{"Add":" path"},{"Add":" }"},{"Add":""},{"Add":" pub fn tag_filename(&self, hash: &Merkle) -> PathBuf {"},{"Add":" let mut path = self.changes_dir.clone();"},{"Add":" push_tag_filename(&mut path, hash);"}]}},{"Edit":{"inode":{"change":11,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":166,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":828467}],"down_context":[{"change":11,"pos":828467}],"flag":"BLOCK","start":46883,"end":47097,"inode":{"change":11,"pos":824013}}},"contents":[{"Add":" fn get_tag_header(&self, h: &Merkle) -> Result {"},{"Add":" let path = self.tag_filename(h);"},{"Add":" let mut p = crate::tag::OpenTagFile::open(&path, h)?;"},{"Add":" Ok(p.header()?)"},{"Add":" }"},{"Add":""}]}}],"owner":"irevoire","repo":"pijul","token":"YYOByyw/ZP1OQqRYYseuAQzmYDsZCHlzdMYVahaO4Kc=","login":null}

…

Dependencies

Change contents