{"header":{"message":"WIP","description":null,"timestamp":"2024-04-05T18:41:00.556466269Z","authors":[{}]},"hash":"ZLDJRMVBOGTLW6BAS3IOVYXR4BLUZ2YWGWIIPA3NFUG4RRTOGZKQC","authors":[{"login":"dblsaiko","key":"FeMhzz74btJURqQy9nfU1xL9Jvbzr7GuZXu3HGNFY331"}],"deps":{"hashes":[["ZLDJRMVBOGTLW6BAS3IOVYXR4BLUZ2YWGWIIPA3NFUG4RRTOGZKQC","WIP"],["AA",null],["3E2KY6Y4SQ2UO6PLA4K3MQKHIRHSQCBAJIPJT7NQ6BIETMAQX5QAC","Deterministic ordering of pulled patches"],["5Z2Y7VGVHJ7A6UPSEAPFVMIB5J7YHSI6WWHUUUYVLDJ56XSNCXKQC","Migrate `pijul::identity::Complete::prove` to `pijul::remote::prove`"],["RIZ4IP76N4PNGXMMZSFPOQIUQICFMGSHJNJMYZGHM4WODM45QOHAC","Solving more conflicts"],["LKIKT4FRKVZAYITMKO23RRFZG25UFX7J6GBOOUQOD24YBRNLHLOAC","[2/?] Clean up change file name handling"],["6WIH3U43354JLREJ2CU7RSFPXJ4ZOWKY6T2KCZRH5FBD6S3MZ5BAC","WIP"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","Formatting + big-endian Sanakirja"],["RVAH6PXA7H7NUDTF7Q52I7EXGXVJVMGI2LTNN6L3MVEDEMAXVH4AC","Getting libpijul to compile to WASM32"],["5XMUEZMZXQ4T4HGZAGBZWT5YKEXOA7IWLZBSREWBHXLMGHXOFXZAC","pijul-clone: avoid panics on parsing remote URLs"],["PNJL5TPZLQ3VXAASTLUX7462RCRPO7TV3GKOTTHDZABDQCBMXPRQC","Version bump"],["IBPVOKM5MXTGB2P7LCD75MISAYUNDPEKQAUEVCXJJWLWCX2TJZBAC","Fixing a bug in patch download"],["X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","Do not download changes if we already have them"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC","Fixing a race condition between progress bars"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","Friendlier progress bars"],["G7HJHNFDZCGOPGVETNYK7BDDPJXHEIPGZJEJXBGBXSWPWEX3BIQQC","Migrate from `pijul_interaction::progress` to `pijul_interaction`"],["IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","Improved push/pull reporting"],["JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","Migrate from `pijul::progress` to `pijul_interaction::progress`"],["WCA7X6W633OI72GFB4QPQKAF3POVTBB5HO2NRSVBJRO5BUJL2ORQC","Create `pijul-repository` crate"],["OYN2YVPAN6L3X6HZXJI6B2GYGL2W5AXRK6CVDJRWALS5OENNB5UAC","Create `pijul_remote` crate"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","Tag synchronisation"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["ISCWVXO6UN37V2QMR75ZWS7H5E7WYZCGR6TX3EDFOFRVCAPMIVUAC","Progress bar for push"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["C3L2TLQWREYOM3YHL37L7PS74YGLHBEDQRSCVMYIU6HKBEPNN2SAC","When downloading changes, check whether we have their dependencies and download them too"],["A6JQQNNJOW3NKD5LYSBJU43HVSBTL2TP2PZ6J446JJ4CFMI5JOCQC","More appropriate debug messages"],["EJ7TFFOWLM5EXYX57NJZZX3NLPBLLMRX7CGJYC75DJZ5LYXOQPJAC","Re-adding Cargo.lock"],["DVBSW7SICQMTYIC4NOLA3CBRU5OWPAWX3MYEOZ7UWXF3IJLLJDYQC","Bump dependencies with minor-level changes"],["HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","Solving conflicts"],["HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","Pulling more than 100 changes at once"],["GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","Cursors cleanup"],["ZWVYH7WPYOGDKWODFSAJ6R5U64DON2AVVJ2XZJKHAOMLJEFTYF3QC","Pulling local tags"],["4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC","Fixing HTTP download"],["3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","Fixing async issues in downloads"],["Z6ASIMORLV437IEFIUYXIRYSGUTIBMPJNIVF6XQMGRP6WV6R4YPAC","Avoid increasing the download progress bar length if we need the same dependency more than once"],["OGJFEWHUMFIZYBS456FPNUN3KEUDZXIJNFGPEMJGQDC7INZMHQZQC","Fixing missing dependencies on partial clones"],["UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC","Clean up change file name handling"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["XQHABMC2FOMH7SZIYVYAR5MNH2DK2AOUCX2RJKZM3PDG2H5JIXYQC","Do not block when there is no patch to pull"],["PYTC7DPVCWKYDXXBY44BBNB4DHZ3N4OQW3EOEQ7H6Z5P5XBG2EIAC","Partial clones: including all the subtree of a directory when selecting patches"],["4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","Migrate from `pijul::config` to `pijul-config`"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"]],"deps":["3E2KY6Y4SQ2UO6PLA4K3MQKHIRHSQCBAJIPJT7NQ6BIETMAQX5QAC","5Z2Y7VGVHJ7A6UPSEAPFVMIB5J7YHSI6WWHUUUYVLDJ56XSNCXKQC","RIZ4IP76N4PNGXMMZSFPOQIUQICFMGSHJNJMYZGHM4WODM45QOHAC","LKIKT4FRKVZAYITMKO23RRFZG25UFX7J6GBOOUQOD24YBRNLHLOAC","6WIH3U43354JLREJ2CU7RSFPXJ4ZOWKY6T2KCZRH5FBD6S3MZ5BAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC","X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","5XMUEZMZXQ4T4HGZAGBZWT5YKEXOA7IWLZBSREWBHXLMGHXOFXZAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","A6JQQNNJOW3NKD5LYSBJU43HVSBTL2TP2PZ6J446JJ4CFMI5JOCQC","ISCWVXO6UN37V2QMR75ZWS7H5E7WYZCGR6TX3EDFOFRVCAPMIVUAC","IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","ZWVYH7WPYOGDKWODFSAJ6R5U64DON2AVVJ2XZJKHAOMLJEFTYF3QC","C3L2TLQWREYOM3YHL37L7PS74YGLHBEDQRSCVMYIU6HKBEPNN2SAC","XQHABMC2FOMH7SZIYVYAR5MNH2DK2AOUCX2RJKZM3PDG2H5JIXYQC","IBPVOKM5MXTGB2P7LCD75MISAYUNDPEKQAUEVCXJJWLWCX2TJZBAC","4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC","Z6ASIMORLV437IEFIUYXIRYSGUTIBMPJNIVF6XQMGRP6WV6R4YPAC","EJ7TFFOWLM5EXYX57NJZZX3NLPBLLMRX7CGJYC75DJZ5LYXOQPJAC","RVAH6PXA7H7NUDTF7Q52I7EXGXVJVMGI2LTNN6L3MVEDEMAXVH4AC","PNJL5TPZLQ3VXAASTLUX7462RCRPO7TV3GKOTTHDZABDQCBMXPRQC","QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","DVBSW7SICQMTYIC4NOLA3CBRU5OWPAWX3MYEOZ7UWXF3IJLLJDYQC","4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","WCA7X6W633OI72GFB4QPQKAF3POVTBB5HO2NRSVBJRO5BUJL2ORQC","G7HJHNFDZCGOPGVETNYK7BDDPJXHEIPGZJEJXBGBXSWPWEX3BIQQC","OYN2YVPAN6L3X6HZXJI6B2GYGL2W5AXRK6CVDJRWALS5OENNB5UAC","HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","PYTC7DPVCWKYDXXBY44BBNB4DHZ3N4OQW3EOEQ7H6Z5P5XBG2EIAC","OGJFEWHUMFIZYBS456FPNUN3KEUDZXIJNFGPEMJGQDC7INZMHQZQC","UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC"]},"hunks":[{"Edit":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":52474}],"down_context":[{"change":7,"pos":853}],"flag":"BLOCK","start":0,"end":24,"inode":{"change":7,"pos":52474}}},"contents":[{"Add":"use std::cell::RefCell;"}]}},{"Edit":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":884}],"down_context":[{"change":3,"pos":0}],"flag":"BLOCK","start":25,"end":50,"inode":{"change":7,"pos":52474}}},"contents":[{"Add":"use std::future::Future;"}]}},{"Edit":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":1902}],"down_context":[{"change":7,"pos":363}],"flag":"BLOCK","start":51,"end":249,"inode":{"change":7,"pos":52474}}},"contents":[{"Add":"use futures_util::future::{FusedFuture, LocalBoxFuture};"},{"Add":"use futures_util::stream::{FuturesUnordered, Once};"},{"Add":"use futures_util::{FutureExt, stream, StreamExt};"},{"Add":"use futures_util::task::LocalSpawnExt;"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":18,"ins":{"up_context":[{"change":7,"pos":393}],"down_context":[{"change":7,"pos":2711}],"flag":"BLOCK","start":250,"end":304,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":393},"to":{"change":7,"start":2672,"end":2711},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":"use libpijul::changestore::{ChangeStore, filesystem};"}],"del_contents":[{"Del":"use libpijul::changestore::filesystem;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":24,"ins":{"up_context":[{"change":7,"pos":137}],"down_context":[{"change":7,"pos":138}],"flag":"BLOCK","start":305,"end":339,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":137},"to":{"change":7,"start":52599,"end":52622},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":602},"to":{"change":7,"start":52599,"end":52622},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1128},"to":{"change":7,"start":52599,"end":52622},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":52599},"to":{"change":7,"start":52599,"end":52622},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":"use libpijul::{DOT_DIR, HashMap};"}],"del_contents":[{"Del":"use libpijul::DOT_DIR;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":41,"ins":{"up_context":[{"change":7,"pos":344}],"down_context":[{"change":6,"pos":1913}],"flag":"BLOCK","start":340,"end":353,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":344},"to":{"change":6,"start":1903,"end":1913},"introduced_by":6}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":"mod context;"}],"del_contents":[{"Del":"mod pipe;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1172,"ins":{"up_context":[{"change":7,"pos":66586}],"down_context":[{"change":7,"pos":66587}],"flag":"BLOCK","start":354,"end":355,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":66586},"to":{"change":6,"start":1915,"end":1920},"introduced_by":6}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" \n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1174,"ins":{"up_context":[{"change":7,"pos":66651}],"down_context":[{"change":7,"pos":66691}],"flag":"BLOCK","start":356,"end":387,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":66651},"to":{"change":7,"start":10619,"end":10654},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" async fn download_changes("}],"del_contents":[{"Del":" pub async fn download_changes(\n"}]}},{"Edit":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1251,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":1155},"to":{"change":7,"start":2674,"end":2675},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2674},"to":{"change":7,"start":2674,"end":2675},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2675},"to":{"change":7,"start":0,"end":64},"introduced_by":7}],"inode":{"change":7,"pos":52474}}},"contents":[{"Del":"\n"},{"Del":" let (mut send, recv) = tokio::sync::mpsc::channel(100);\n"}]}},{"Edit":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1252,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1207},"to":{"change":7,"start":1207,"end":1274},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1274},"to":{"change":7,"start":2676,"end":2757},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1472},"to":{"change":7,"start":1638,"end":1694},"introduced_by":7}],"inode":{"change":7,"pos":52474}}},"contents":[{"Del":" let mut self_ = std::mem::replace(self, RemoteRepo::None);\n"},{"Del":" let (hash_send, mut hash_recv) = tokio::sync::mpsc::unbounded_channel();\n"},{"Del":" let cloned_download_bar = download_bar.clone();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1253,"ins":{"up_context":[{"change":5,"pos":52}],"down_context":[{"change":2,"pos":95}],"flag":"BLOCK","start":388,"end":560,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":52},"to":{"change":7,"start":1472,"end":1532},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1694},"to":{"change":7,"start":1472,"end":1532},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2806},"to":{"change":7,"start":1472,"end":1532},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3492},"to":{"change":7,"start":1472,"end":1532},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1472},"to":{"change":7,"start":1472,"end":1532},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1532},"to":{"change":7,"start":1695,"end":1838},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1838},"to":{"change":5,"start":53,"end":87},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":87},"to":{"change":7,"start":1877,"end":1922},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3531},"to":{"change":7,"start":1877,"end":1922},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1877},"to":{"change":7,"start":1877,"end":1922},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1250},"to":{"change":7,"start":1619,"end":1644},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1922},"to":{"change":7,"start":1619,"end":1644},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3024},"to":{"change":7,"start":1619,"end":1644},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1619},"to":{"change":7,"start":1619,"end":1644},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1644},"to":{"change":7,"start":1923,"end":1924},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1924},"to":{"change":7,"start":1644,"end":1698},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1644},"to":{"change":7,"start":1644,"end":1698},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1698},"to":{"change":7,"start":69053,"end":69054},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":69053},"to":{"change":7,"start":69053,"end":69054},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3095},"to":{"change":7,"start":65,"end":94},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":94},"to":{"change":7,"start":0,"end":77},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":77},"to":{"change":7,"start":0,"end":40},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":40},"to":{"change":7,"start":231,"end":259},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":77},"to":{"change":7,"start":231,"end":259},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":94},"to":{"change":7,"start":231,"end":259},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1724},"to":{"change":7,"start":231,"end":259},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3095},"to":{"change":7,"start":231,"end":259},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":231},"to":{"change":7,"start":231,"end":259},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":259},"to":{"change":7,"start":78,"end":118},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":118},"to":{"change":7,"start":3532,"end":3533},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3533},"to":{"change":7,"start":41,"end":71},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":454},"to":{"change":7,"start":41,"end":71},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":71},"to":{"change":7,"start":119,"end":178},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":454},"to":{"change":7,"start":119,"end":178},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":529},"to":{"change":7,"start":534,"end":544},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":534},"to":{"change":7,"start":534,"end":544},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":544},"to":{"change":7,"start":126,"end":127},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":127},"to":{"change":7,"start":179,"end":200},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":200},"to":{"change":7,"start":1925,"end":2151},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":164},"to":{"change":7,"start":237,"end":258},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":285},"to":{"change":7,"start":237,"end":258},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2151},"to":{"change":7,"start":237,"end":258},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":237},"to":{"change":7,"start":237,"end":258},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":258},"to":{"change":7,"start":0,"end":1},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":592},"to":{"change":7,"start":0,"end":1},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2868},"to":{"change":7,"start":0,"end":1},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":69159},"to":{"change":7,"start":0,"end":1},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":69755},"to":{"change":7,"start":69755,"end":69809},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":69809},"to":{"change":2,"start":0,"end":50},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":50},"to":{"change":7,"start":286,"end":340},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1454},"to":{"change":7,"start":286,"end":340},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":311},"to":{"change":7,"start":3174,"end":3215},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":340},"to":{"change":7,"start":3174,"end":3215},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":621},"to":{"change":7,"start":3174,"end":3215},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1456},"to":{"change":7,"start":1456,"end":1641},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1641},"to":{"change":7,"start":312,"end":363},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":363},"to":{"change":7,"start":16600,"end":16882},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":16600},"to":{"change":7,"start":16600,"end":16882},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":16882},"to":{"change":7,"start":320,"end":539},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":539},"to":{"change":7,"start":17273,"end":17304},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":17273},"to":{"change":7,"start":17273,"end":17304},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":17304},"to":{"change":7,"start":2262,"end":2289},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2262},"to":{"change":7,"start":2262,"end":2289},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2289},"to":{"change":7,"start":17305,"end":17386},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":17386},"to":{"change":7,"start":2312,"end":2330},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2312},"to":{"change":7,"start":2312,"end":2330},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2330},"to":{"change":7,"start":364,"end":437},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":437},"to":{"change":7,"start":2392,"end":2425},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":17461},"to":{"change":7,"start":2392,"end":2425},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2392},"to":{"change":7,"start":2392,"end":2425},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2425},"to":{"change":2,"start":51,"end":94},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":94},"to":{"change":7,"start":2467,"end":2529},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":7,"pos":479},"to":{"change":7,"start":2467,"end":2529},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2467},"to":{"change":7,"start":2467,"end":2529},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2529},"to":{"change":7,"start":144,"end":201},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":201},"to":{"change":7,"start":972,"end":1015},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1292},"to":{"change":7,"start":972,"end":1015},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2209},"to":{"change":7,"start":972,"end":1015},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3500},"to":{"change":7,"start":972,"end":1015},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":972},"to":{"change":7,"start":972,"end":1015},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1015},"to":{"change":7,"start":2210,"end":2244},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":221},"to":{"change":7,"start":3567,"end":3600},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1355},"to":{"change":7,"start":3567,"end":3600},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2244},"to":{"change":7,"start":3567,"end":3600},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3567},"to":{"change":7,"start":3567,"end":3600},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3600},"to":{"change":7,"start":17462,"end":17560},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":17560},"to":{"change":7,"start":480,"end":568},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":568},"to":{"change":7,"start":17643,"end":17661},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":17643},"to":{"change":7,"start":17643,"end":17661},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":139},"to":{"change":7,"start":3601,"end":3636},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":17661},"to":{"change":7,"start":3601,"end":3636},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7732},"to":{"change":7,"start":3601,"end":3636},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3636},"to":{"change":7,"start":70594,"end":70662},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":7732},"to":{"change":7,"start":70594,"end":70662},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70594},"to":{"change":7,"start":70594,"end":70662},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" "},{"Add":" self.download_changes_with(download_bar, &changes_dir, false, |cx| async move {"},{"Add":" "},{"Add":" "},{"Add":" for h in to_apply {"},{"Add":" "}],"del_contents":[{"Del":" let t = tokio::spawn(async move {\n self_\n"},{"Del":" .download_changes(\n cloned_download_bar,\n &mut hash_recv,\n &mut send,\n"},{"Del":" &changes_dir,\n"},{"Del":" false,\n )\n"},{"Del":" .await?;\n"},{"Del":"\n"},{"Del":" Ok::<_, anyhow::Error>(self_)\n });\n"},{"Del":"\n"},{"Del":" let mut waiting = 0;\n"},{"Del":" let (send_ready, mut recv_ready) = tokio::sync::mpsc::channel(100);\n\n"},{"Del":" let mut asked = HashSet::new();\n"},{"Del":" for h in to_apply {\n"},{"Del":" debug!(\"to_apply {:?}\", h);\n"},{"Del":"\n"},{"Del":" asked.insert(*h);\n"},{"Del":" hash_send.send(*h)?;\n waiting += 1;\n"},{"Del":" }\n"},{"Del":"\n"},{"Del":" let u = self\n"},{"Del":" .download_changes_rec(\n repo,\n hash_send,\n recv,\n send_ready,\n download_bar,\n waiting,\n asked,\n )\n"},{"Del":" .await?;\n"},{"Del":"\n"},{"Del":" let mut ws = libpijul::ApplyWorkspace::new();\n"},{"Del":" let mut to_apply_inodes = HashSet::new();\n"},{"Del":" while let Some(h) = recv_ready.recv().await {\n"},{"Del":" debug!(\"to_apply: {:?}\", h);\n"},{"Del":" let touches_inodes = inodes.is_empty()\n || {\n debug!(\"inodes = {:?}\", inodes);\n use libpijul::changestore::ChangeStore;\n"},{"Del":" if let CS::Change(ref h) = h {\n"},{"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"},{"Del":" inodes.contains(&Position {\n change: inode.change.unwrap_or(*h),\n pos: inode.pos,\n })\n"},{"Del":" })\n"},{"Del":" })\n"},{"Del":" } else {\n false\n }\n"},{"Del":" }\n"},{"Del":" || { inodes.iter().any(|i| CS::Change(i.change) == h) };\n"},{"Del":"\n if touches_inodes {\n"},{"Del":" to_apply_inodes.insert(h);\n"},{"Del":" } else {\n continue;\n }\n\n"},{"Del":" if let Some(apply_bar) = apply_bar.clone() {\n"},{"Del":" info!(\"Applying {:?}\", h);\n"},{"Del":" apply_bar.inc(1);\n"},{"Del":" debug!(\"apply\");\n"},{"Del":" if let CS::Change(h) = h {\n let mut channel = channel.write();\n"},{"Del":" txn.apply_change_rec_ws(&repo.changes, &mut channel, &h, &mut ws)?;\n"},{"Del":" }\n"},{"Del":" debug!(\"applied\");\n"},{"Del":" } else {\n debug!(\"not applying {:?}\", h)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1260,"ins":{"up_context":[{"change":2,"pos":109}],"down_context":[{"change":2,"pos":119}],"flag":"BLOCK","start":561,"end":612,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":109},"to":{"change":2,"start":109,"end":119},"introduced_by":2}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" "},{"Add":" Ok(())"},{"Add":" }).await?;"}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1264,"ins":{"up_context":[{"change":2,"pos":120}],"down_context":[{"change":7,"pos":7755}],"flag":"BLOCK","start":613,"end":629,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":120},"to":{"change":2,"start":120,"end":294},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":294},"to":{"change":7,"start":1167,"end":1191},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1167},"to":{"change":7,"start":1167,"end":1191},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" todo!()"}],"del_contents":[{"Del":" let mut result = Vec::with_capacity(to_apply_inodes.len());\n for h in to_apply {\n if to_apply_inodes.contains(&h) {\n result.push(*h)\n"},{"Del":" }\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1266,"ins":{"up_context":[{"change":7,"pos":7756}],"down_context":[{"change":7,"pos":70874}],"flag":"BLOCK","start":630,"end":3658,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":7756},"to":{"change":7,"start":3637,"end":3665},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1191},"to":{"change":7,"start":3637,"end":3665},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70716},"to":{"change":7,"start":700,"end":747},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":747},"to":{"change":7,"start":294,"end":321},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70716},"to":{"change":7,"start":294,"end":321},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":321},"to":{"change":7,"start":569,"end":588},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1405},"to":{"change":2,"start":295,"end":314},"introduced_by":2}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" // let mut waiting = 0;"},{"Add":" // let (send_ready, mut recv_ready) = tokio::sync::mpsc::channel(100);"},{"Add":" //"},{"Add":" // let mut asked = HashSet::new();"},{"Add":" // for h in to_apply {"},{"Add":" // debug!(\"to_apply {:?}\", h);"},{"Add":" //"},{"Add":" // asked.insert(*h);"},{"Add":" // hash_send.send(*h)?;"},{"Add":" // waiting += 1;"},{"Add":" // }"},{"Add":" //"},{"Add":" // let u = self"},{"Add":" // .download_changes_rec("},{"Add":" // repo,"},{"Add":" // hash_send,"},{"Add":" // recv,"},{"Add":" // send_ready,"},{"Add":" // download_bar,"},{"Add":" // waiting,"},{"Add":" // asked,"},{"Add":" // )"},{"Add":" // .await?;"},{"Add":" //"},{"Add":" // let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" // let mut to_apply_inodes = HashSet::new();"},{"Add":" // while let Some(h) = recv_ready.recv().await {"},{"Add":" // debug!(\"to_apply: {:?}\", h);"},{"Add":" // let touches_inodes = inodes.is_empty()"},{"Add":" // || {"},{"Add":" // debug!(\"inodes = {:?}\", inodes);"},{"Add":" // use libpijul::changestore::ChangeStore;"},{"Add":" // if let CS::Change(ref 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":" // inodes.contains(&Position {"},{"Add":" // change: inode.change.unwrap_or(*h),"},{"Add":" // pos: inode.pos,"},{"Add":" // })"},{"Add":" // })"},{"Add":" // })"},{"Add":" // } else {"},{"Add":" // false"},{"Add":" // }"},{"Add":" // }"},{"Add":" // || { inodes.iter().any(|i| CS::Change(i.change) == h) };"},{"Add":" //"},{"Add":" // if touches_inodes {"},{"Add":" // to_apply_inodes.insert(h);"},{"Add":" // } else {"},{"Add":" // continue;"},{"Add":" // }"},{"Add":" //"},{"Add":" // if let Some(apply_bar) = apply_bar.clone() {"},{"Add":" // info!(\"Applying {:?}\", h);"},{"Add":" // apply_bar.inc(1);"},{"Add":" // debug!(\"apply\");"},{"Add":" // if let CS::Change(h) = h {"},{"Add":" // let mut channel = channel.write();"},{"Add":" // txn.apply_change_rec_ws(&repo.changes, &mut channel, &h, &mut ws)?;"},{"Add":" // }"},{"Add":" // debug!(\"applied\");"},{"Add":" // } else {"},{"Add":" // debug!(\"not applying {:?}\", h)"},{"Add":" // }"},{"Add":" // }"},{"Add":" //"},{"Add":" // let mut result = Vec::with_capacity(to_apply_inodes.len());"},{"Add":" // for h in to_apply {"},{"Add":" // if to_apply_inodes.contains(&h) {"},{"Add":" // result.push(*h)"},{"Add":" // }"},{"Add":" // }"},{"Add":" //"},{"Add":" // debug!(\"finished\");"},{"Add":" // debug!(\"waiting for spawned process\");"},{"Add":" // *self = t.await??;"},{"Add":" // u.await??;"},{"Add":" // Ok(result)"}],"del_contents":[{"Del":" debug!(\"finished\");\n"},{"Del":" debug!(\"waiting for spawned process\");\n"},{"Del":" *self = t.await??;\n"},{"Del":" u.await??;\n"},{"Del":" Ok(result)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1350,"ins":{"up_context":[{"change":7,"pos":590}],"down_context":[{"change":7,"pos":625}],"flag":"BLOCK","start":3659,"end":3698,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":590},"to":{"change":7,"start":590,"end":625},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" async fn download_changes_rec<'a>("}],"del_contents":[{"Del":" async fn download_changes_rec(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1352,"ins":{"up_context":[{"change":7,"pos":644}],"down_context":[{"change":7,"pos":2245}],"flag":"BLOCK","start":3699,"end":3762,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":644},"to":{"change":7,"start":644,"end":800},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":800},"to":{"change":7,"start":341,"end":392},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" cx: DownloadContext<'a>,"},{"Add":" repo: &'a Repository,"}],"del_contents":[{"Del":" repo: &mut Repository,\n send_hash: tokio::sync::mpsc::UnboundedSender,\n mut recv_signal: tokio::sync::mpsc::Receiver<(CS, bool)>,\n"},{"Del":" send_ready: tokio::sync::mpsc::Sender,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1355,"ins":{"up_context":[{"change":7,"pos":2280}],"down_context":[{"change":7,"pos":3629}],"flag":"BLOCK","start":3763,"end":4730,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":2280},"to":{"change":7,"start":822,"end":850},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":822},"to":{"change":7,"start":822,"end":850},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":850},"to":{"change":7,"start":165,"end":197},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":197},"to":{"change":7,"start":393,"end":478},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":850},"to":{"change":7,"start":393,"end":478},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":478},"to":{"change":7,"start":3534,"end":3586},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3586},"to":{"change":7,"start":1209,"end":1295},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1209},"to":{"change":7,"start":1209,"end":1295},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1295},"to":{"change":7,"start":3587,"end":3629},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" items: impl IntoIterator + 'a,"},{"Add":" ) -> impl Stream> + 'a {"},{"Add":" try_stream(|sender| async move {"},{"Add":" struct State<'a> {"},{"Add":" cx: DownloadContext<'a>,"},{"Add":" repo: &'a Repository,"},{"Add":" sender: mpsc::Sender>,"},{"Add":" futs: FuturesUnordered>>,"},{"Add":" barriers: RefCell>>,"},{"Add":" }"},{"Add":" "},{"Add":" let state = State {"},{"Add":" cx,"},{"Add":" repo,"},{"Add":" sender,"},{"Add":" futs: Default::default(),"},{"Add":" barriers: RefCell::new(Default::default()),"},{"Add":" };"},{"Add":" "},{"Add":" fn go<'a>(state: &'a State<'a>, cs: CS) -> watch::Receiver<()> {"},{"Add":" state.barriers.borrow_mut().entry(cs).or_insert_with(|| {"},{"Add":" let (tx, mut rx) = watch::channel(());"},{"Add":" rx.mark_unchanged();"}],"del_contents":[{"Del":" mut waiting: usize,\n"},{"Del":" mut asked: HashSet,\n"},{"Del":" ) -> Result>, anyhow::Error> {\n"},{"Del":" let changes_dir = repo.changes_dir.clone();\n"},{"Del":" let changes = repo.changes.clone();\n let t = tokio::spawn(async move {\n"},{"Del":" let mut buf = PathBuf::new();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1379,"ins":{"up_context":[{"change":7,"pos":3630}],"down_context":[{"change":7,"pos":60}],"flag":"BLOCK","start":4731,"end":5043,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":3630},"to":{"change":7,"start":0,"end":30},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1295},"to":{"change":7,"start":0,"end":30},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":30},"to":{"change":7,"start":2281,"end":2312},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" state.futs.push(async move {"},{"Add":" let _tx = tx;"},{"Add":" go2(state, cs).await?;"},{"Add":" state.sender.send(Ok(cs)).await?;"},{"Add":" Ok(())"},{"Add":" }.boxed_local());"},{"Add":""},{"Add":" rx"},{"Add":" }).clone()"}],"del_contents":[{"Del":" if waiting == 0 {\n"},{"Del":" return Ok(());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1389,"ins":{"up_context":[{"change":7,"pos":74}],"down_context":[{"change":7,"pos":1956}],"flag":"BLOCK","start":5044,"end":5199,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":74},"to":{"change":7,"start":1295,"end":1407},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1295},"to":{"change":7,"start":1295,"end":1407},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1407},"to":{"change":7,"start":198,"end":258},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":258},"to":{"change":7,"start":1407,"end":1522},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1407},"to":{"change":7,"start":1407,"end":1522},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1702},"to":{"change":7,"start":1702,"end":1956},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" "},{"Add":" async fn go2<'a>(state: &'a State<'a>, cs: CS) -> anyhow::Result<()> {"},{"Add":" let follow = state.cx.download(cs).await?;"}],"del_contents":[{"Del":" let mut ready = Vec::new();\n while let Some((hash, follow)) = recv_signal.recv().await {\n"},{"Del":" debug!(\"received {:?} {:?}\", hash, follow);\n"},{"Del":" if let CS::Change(hash) = hash {\n waiting -= 1;\n if follow {\n"},{"Del":" use libpijul::changestore::ChangeStore;\n let mut needs_dep = false;\n for dep in changes.get_dependencies(&hash)? {\n let dep: libpijul::pristine::Hash = dep;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1393,"ins":{"up_context":[{"change":7,"pos":1957}],"down_context":[{"change":7,"pos":70880}],"flag":"BLOCK","start":5200,"end":5303,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1957},"to":{"change":7,"start":3631,"end":3718},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":3718},"to":{"change":7,"start":2056,"end":2136},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2056},"to":{"change":7,"start":2056,"end":2136},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" let CS::Change(hash) = cs else {"},{"Add":" return Ok(());"},{"Add":" };"}],"del_contents":[{"Del":" let dep_path = fmt_filename(&mut buf, &changes_dir, &dep);\n"},{"Del":" let has_dep = std::fs::metadata(&dep_path).is_ok();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1397,"ins":{"up_context":[{"change":7,"pos":70881}],"down_context":[{"change":7,"pos":2661}],"flag":"BLOCK","start":5304,"end":5715,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":70881},"to":{"change":7,"start":2229,"end":2321},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2403},"to":{"change":7,"start":259,"end":326},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":326},"to":{"change":7,"start":2313,"end":2370},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":86},"to":{"change":7,"start":326,"end":479},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2370},"to":{"change":7,"start":326,"end":479},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":326},"to":{"change":7,"start":326,"end":479},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":479},"to":{"change":7,"start":2514,"end":2570},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2514},"to":{"change":7,"start":2514,"end":2570},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" if !follow {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" "},{"Add":" wait_for(state, state.repo.changes.get_dependencies(&hash)?.into_iter().map(CS::Change)).await;"},{"Add":" "},{"Add":" Ok(())"},{"Add":" }"},{"Add":" "},{"Add":" async fn wait_for<'a>(state: &'a State<'a>, items: impl IntoIterator) {"},{"Add":" let mut v = Vec::new();"}],"del_contents":[{"Del":" if !has_dep {\n needs_dep = true;\n"},{"Del":" if asked.insert(CS::Change(dep)) {\n"},{"Del":" progress_bar.inc(1);\n"},{"Del":" send_hash.send(CS::Change(dep))?;\n waiting += 1\n }\n"},{"Del":" }\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1409,"ins":{"up_context":[{"change":7,"pos":2662}],"down_context":[{"change":7,"pos":3005}],"flag":"BLOCK","start":5716,"end":5797,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2662},"to":{"change":7,"start":2662,"end":3005},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" for item in items {"},{"Add":" v.push(go(state, item));"}],"del_contents":[{"Del":" if !needs_dep {\n send_ready.send(CS::Change(hash)).await?;\n } else {\n ready.push(CS::Change(hash))\n }\n } else {\n send_ready.send(CS::Change(hash)).await?;\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1412,"ins":{"up_context":[{"change":7,"pos":3023}],"down_context":[{"change":7,"pos":3084}],"flag":"BLOCK","start":5798,"end":5879,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3023},"to":{"change":7,"start":3023,"end":3084},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" for mut r in v {"},{"Add":" let _ = r.changed().await;"}],"del_contents":[{"Del":" if waiting == 0 {\n break;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1417,"ins":{"up_context":[{"change":7,"pos":3116}],"down_context":[{"change":7,"pos":3188}],"flag":"BLOCK","start":5880,"end":6125,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3116},"to":{"change":7,"start":480,"end":520},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":520},"to":{"change":7,"start":3116,"end":3188},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3116},"to":{"change":7,"start":3116,"end":3188},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" "},{"Add":" state.futs.push(async move {"},{"Add":" wait_for(&state, items).await;"},{"Add":" Ok(())"},{"Add":" }.boxed_local());"},{"Add":" "},{"Add":" while let Some(v) = state.futs.next().await {"},{"Add":" v?;"}],"del_contents":[{"Del":" info!(\"waiting loop done\");\n"},{"Del":" for r in ready {\n send_ready.send(r).await?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1426,"ins":{"up_context":[{"change":7,"pos":3202}],"down_context":[{"change":7,"pos":3243}],"flag":"BLOCK","start":6126,"end":6139,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3202},"to":{"change":7,"start":3202,"end":3243},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" "}],"del_contents":[{"Del":" std::mem::drop(recv_signal);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1428,"ins":{"up_context":[{"change":7,"pos":3262}],"down_context":[{"change":7,"pos":3302}],"flag":"BLOCK","start":6140,"end":8231,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3262},"to":{"change":7,"start":3262,"end":3274},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3274},"to":{"change":7,"start":479,"end":493},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" })"},{"Add":" // let t = tokio::spawn(async move {"},{"Add":" // let mut buf = PathBuf::new();"},{"Add":" //"},{"Add":" // if waiting == 0 {"},{"Add":" // return Ok(());"},{"Add":" // }"},{"Add":" // let mut ready = Vec::new();"},{"Add":" // while let Some((hash, follow)) = recv_signal.recv().await {"},{"Add":" // if let CS::Change(hash) = hash {"},{"Add":" // waiting -= 1;"},{"Add":" // if follow {"},{"Add":" // use libpijul::changestore::ChangeStore;"},{"Add":" // let mut needs_dep = false;"},{"Add":" // for dep in changes.get_dependencies(&hash)? {"},{"Add":" // let dep: libpijul::pristine::Hash = dep;"},{"Add":" //"},{"Add":" // let dep_path = fmt_filename(&mut buf, &changes_dir, &dep);"},{"Add":" // let has_dep = std::fs::metadata(&dep_path).is_ok();"},{"Add":" //"},{"Add":" // if !has_dep {"},{"Add":" // needs_dep = true;"},{"Add":" // if asked.insert(CS::Change(dep)) {"},{"Add":" // progress_bar.inc(1);"},{"Add":" // send_hash.send(CS::Change(dep))?;"},{"Add":" // waiting += 1"},{"Add":" // }"},{"Add":" // }"},{"Add":" // }"},{"Add":" //"},{"Add":" // if !needs_dep {"},{"Add":" // send_ready.send(CS::Change(hash)).await?;"},{"Add":" // } else {"},{"Add":" // ready.push(CS::Change(hash))"},{"Add":" // }"},{"Add":" // } else {"},{"Add":" // send_ready.send(CS::Change(hash)).await?;"},{"Add":" // }"},{"Add":" // }"},{"Add":" // if waiting == 0 {"},{"Add":" // break;"},{"Add":" // }"},{"Add":" // }"},{"Add":" // info!(\"waiting loop done\");"},{"Add":" // for r in ready {"},{"Add":" // send_ready.send(r).await?;"},{"Add":" // }"},{"Add":" // std::mem::drop(recv_signal);"},{"Add":" // Ok(())"},{"Add":" // });"},{"Add":" // Ok(t)"}],"del_contents":[{"Del":" });\n"},{"Del":" Ok(t)\n"}]}},{"Edit":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1696,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":2980}],"down_context":[{"change":7,"pos":2980}],"flag":"BLOCK","start":8232,"end":8328,"inode":{"change":7,"pos":52474}}},"contents":[{"Add":"use tokio::sync::{mpsc, watch};"},{"Add":"use tokio::task::LocalSet;"},{"Add":"use crate::context::DownloadContext;"}]}},{"Edit":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1793,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":79733}],"down_context":[],"flag":"BLOCK","start":8329,"end":9670,"inode":{"change":7,"pos":52474}}},"contents":[{"Add":""},{"Add":"fn try_stream(op: C) -> impl Stream>"},{"Add":"where"},{"Add":" C: FnOnce(mpsc::Sender>) -> F,"},{"Add":" F: Future>,"},{"Add":"{"},{"Add":" stream(|sender| {"},{"Add":" let fut = op(sender.clone());"},{"Add":""},{"Add":" async move {"},{"Add":" if let Err(e) = fut.await {"},{"Add":" let _ = sender.send(Err(e));"},{"Add":" }"},{"Add":" }"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"fn stream(op: C) -> impl Stream"},{"Add":"where"},{"Add":" C: FnOnce(mpsc::Sender) -> F,"},{"Add":" F: Future"},{"Add":"{"},{"Add":" struct Impl {"},{"Add":" fut: Once,"},{"Add":" rx: mpsc::Receiver,"},{"Add":" }"},{"Add":""},{"Add":" impl Stream for Impl"},{"Add":" where"},{"Add":" F: Future,"},{"Add":" {"},{"Add":" type Item = T;"},{"Add":""},{"Add":" fn poll_next(self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll> {"},{"Add":" let (fut, mut rx) = unsafe {"},{"Add":" let this = self.get_unchecked_mut();"},{"Add":" (Pin::new_unchecked(&mut this.fut), Pin::new(&mut this.rx))"},{"Add":" };"},{"Add":""},{"Add":" match (fut.poll_next(cx), rx.poll_recv(cx)) {"},{"Add":" (_, Poll::Ready(Some(v))) => Poll::Ready(Some(v)),"},{"Add":" (Poll::Ready(_), Poll::Ready(None)) => Poll::Ready(None),"},{"Add":" _ => Poll::Pending,"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let (tx, rx) = mpsc::channel(1);"},{"Add":""},{"Add":" Impl {"},{"Add":" fut: stream::once(op(tx)),"},{"Add":" rx,"},{"Add":" }"},{"Add":"}"}]}},{"FileMove":{"meta":{"basename":"context.rs","metadata":0},"old":[{"basename":"pipe.rs","metadata":0}],"up":[{"change":7,"pos":41}],"down":[{"change":6,"pos":32}],"show_perms":false}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":1,"ins":{"up_context":[{"change":6,"pos":32}],"down_context":[{"change":6,"pos":65}],"flag":"BLOCK","start":9693,"end":9857,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32},"to":{"change":6,"start":33,"end":65},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"use anyhow::bail;"},{"Add":"use futures::pin_mut;"},{"Add":"use futures_util::future::Fuse;"},{"Add":"use futures_util::FutureExt;"},{"Add":"use std::cell::RefCell;"},{"Add":"use std::collections::hash_map::Entry;"}],"del_contents":[{"Del":"use std::collections::BTreeMap;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":8,"ins":{"up_context":[{"change":6,"pos":90}],"down_context":[{"change":6,"pos":202}],"flag":"BLOCK","start":9858,"end":9879,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":90},"to":{"change":6,"start":90,"end":202},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"use std::path::Path;"}],"del_contents":[{"Del":"use std::path::{Path, PathBuf};\nuse std::pin::Pin;\nuse std::sync::Mutex;\nuse std::task::{Context, Poll, Waker};\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":10,"ins":{"up_context":[{"change":6,"pos":203}],"down_context":[{"change":6,"pos":269}],"flag":"BLOCK","start":9880,"end":9903,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":203},"to":{"change":6,"start":203,"end":269},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"use libpijul::HashMap;"}],"del_contents":[{"Del":"use futures_util::future::BoxFuture;\nuse futures_util::FutureExt;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":12,"ins":{"up_context":[{"change":6,"pos":305}],"down_context":[{"change":6,"pos":328}],"flag":"BLOCK","start":9904,"end":9936,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":305},"to":{"change":6,"start":305,"end":328},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"use tokio::sync::{mpsc, watch};"}],"del_contents":[{"Del":"use tokio::sync::mpsc;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":16,"ins":{"up_context":[{"change":6,"pos":359}],"down_context":[{"change":6,"pos":681}],"flag":"BLOCK","start":9937,"end":10023,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359},"to":{"change":6,"start":359,"end":681},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"impl RemoteRepo {"},{"Add":" pub async fn download_changes_with("},{"Add":" &mut self,"}],"del_contents":[{"Del":"pub struct FetchChangesState<'a> {\n shared: Mutex>,\n}\n\nstruct Shared<'a> {\n task: BoxFuture<'a, Result>,\n changes: BTreeMap,\n}\n\nstruct ChangeState {\n wakers: Vec,\n}\n\nimpl<'a> FetchChangesState<'a> {\n pub fn new(\n remote: &'a mut RemoteRepo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":20,"ins":{"up_context":[{"change":6,"pos":716}],"down_context":[{"change":6,"pos":737}],"flag":"BLOCK","start":10024,"end":10049,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":716},"to":{"change":6,"start":716,"end":737},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" dest_dir: &Path,"}],"del_contents":[{"Del":" dest_dir: T,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":22,"ins":{"up_context":[{"change":6,"pos":757}],"down_context":[{"change":6,"pos":771}],"flag":"BLOCK","start":10050,"end":10092,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":757},"to":{"change":6,"start":757,"end":771},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" op: C,"},{"Add":" ) -> anyhow::Result"}],"del_contents":[{"Del":" ) -> Self\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":25,"ins":{"up_context":[{"change":6,"pos":781}],"down_context":[{"change":6,"pos":817}],"flag":"BLOCK","start":10093,"end":10181,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":781},"to":{"change":6,"start":781,"end":817},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" C: FnOnce(DownloadContext) -> F,"},{"Add":" F: Future>,"}],"del_contents":[{"Del":" T: AsRef + Send + 'a,\n"}]}},{"Edit":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":30,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":938}],"down_context":[{"change":6,"pos":938}],"flag":"BLOCK","start":10182,"end":10635,"inode":{"change":6,"pos":32}}},"contents":[{"Add":""},{"Add":" let notifiers: RefCell>>>> ="},{"Add":" RefCell::new(Some(HashMap::new()));"},{"Add":""},{"Add":" let dc = DownloadContext {"},{"Add":" data: Default::default(),"},{"Add":" notifiers: ¬ifiers,"},{"Add":" in_tx,"},{"Add":" };"},{"Add":""},{"Add":" let download_task = self"},{"Add":" .download_changes(progress_bar, &mut in_rx, &mut out_tx, dest_dir, full)"},{"Add":" .fuse();"},{"Add":" let control_task = op(dc).fuse();"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":45,"ins":{"up_context":[{"change":6,"pos":939}],"down_context":[{"change":6,"pos":1230}],"flag":"BLOCK","start":10636,"end":11675,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":939},"to":{"change":6,"start":939,"end":1230},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" pin_mut!(download_task);"},{"Add":" pin_mut!(control_task);"},{"Add":""},{"Add":" let mut out_rx = Some(out_rx);"},{"Add":" let mut dl_err = None;"},{"Add":" let mut control_res = None;"},{"Add":""},{"Add":" loop {"},{"Add":" futures::select_biased! {"},{"Add":" next = out_rx.as_mut().map(|v| v.recv().fuse()).unwrap_or(Fuse::terminated()) => {"},{"Add":" let Some((cs, value)) = next else {"},{"Add":" out_rx.take();"},{"Add":" continue;"},{"Add":" };"},{"Add":""},{"Add":" if let Some(ref notifiers) = *notifiers.borrow() {"},{"Add":" if let Some(tx) = notifiers.get(&cs) {"},{"Add":" let _ = tx.send(Some(value));"},{"Add":" }"},{"Add":" };"},{"Add":" }"},{"Add":" res = download_task => {"},{"Add":" notifiers.borrow_mut().take();"},{"Add":" dl_err = res.err();"},{"Add":" }"},{"Add":" res = control_task => {"},{"Add":" control_res = Some(res);"},{"Add":" }"},{"Add":" complete => break,"},{"Add":" }"}],"del_contents":[{"Del":" let task = async move {\n remote\n .download_changes(\n progress_bar,\n &mut in_rx,\n &mut out_tx,\n dest_dir.as_ref(),\n full,\n )\n .await\n"}]}},{"Edit":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":76,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1240},"to":{"change":6,"start":1240,"end":1258},"introduced_by":6}],"inode":{"change":6,"pos":32}}},"contents":[{"Del":" .boxed();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":77,"ins":{"up_context":[{"change":6,"pos":1259}],"down_context":[{"change":6,"pos":1410}],"flag":"BLOCK","start":11676,"end":11845,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1259},"to":{"change":6,"start":1259,"end":1410},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" let control_res = control_res.unwrap();"},{"Add":""},{"Add":" match dl_err {"},{"Add":" None => control_res,"},{"Add":" Some(ce) => control_res.map_err(|e| e.context(ce)),"}],"del_contents":[{"Del":" FetchChangesState {\n shared: Mutex::new(Shared {\n task,\n changes: Default::default(),\n }),\n"}]}},{"Edit":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":84,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":1426}],"down_context":[{"change":6,"pos":1426}],"flag":"BLOCK","start":11846,"end":11848,"inode":{"change":6,"pos":32}}},"contents":[{"Add":"}"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":86,"ins":{"up_context":[{"change":6,"pos":1427}],"down_context":[{"change":6,"pos":1499}],"flag":"BLOCK","start":11849,"end":12042,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1427},"to":{"change":6,"start":1427,"end":1499},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"pub struct DownloadContext<'a> {"},{"Add":" data: RefCell>,"},{"Add":" notifiers: &'a RefCell>>>>,"},{"Add":" in_tx: mpsc::UnboundedSender,"}],"del_contents":[{"Del":" pub fn fetch(&mut self, cs: CS) -> FetchJob {\n todo!()\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":92,"ins":{"up_context":[{"change":6,"pos":1502}],"down_context":[{"change":6,"pos":1563}],"flag":"BLOCK","start":12043,"end":12102,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1502},"to":{"change":6,"start":1502,"end":1563},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"struct ChangeData {"},{"Add":" rx: watch::Receiver>,"}],"del_contents":[{"Del":"pub struct FetchJob<'a> {\n shared: &'a Mutex>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":96,"ins":{"up_context":[{"change":6,"pos":1566}],"down_context":[{"change":6,"pos":1625}],"flag":"BLOCK","start":12103,"end":12275,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1566},"to":{"change":6,"start":1566,"end":1625},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"impl<'a> DownloadContext<'a> {"},{"Add":" pub async fn download(&self, cs: CS) -> anyhow::Result {"},{"Add":" let mut rx = {"},{"Add":" let mut lock = self.data.borrow_mut();"}],"del_contents":[{"Del":"impl<'a> Future for FetchJob<'a> {\n type Output = bool;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":101,"ins":{"up_context":[{"change":6,"pos":1626}],"down_context":[{"change":6,"pos":1760}],"flag":"BLOCK","start":12276,"end":12464,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1626},"to":{"change":6,"start":1626,"end":1760},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" match lock.entry(cs) {"},{"Add":" Entry::Occupied(v) => v.get().rx.clone(),"},{"Add":" Entry::Vacant(v) => {"},{"Add":" let (tx, rx) = watch::channel(None);"}],"del_contents":[{"Del":" fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll {\n let mut shared = self.shared.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"pijul-remote/src/context.rs","line":106,"ins":{"up_context":[{"change":6,"pos":1761}],"down_context":[{"change":6,"pos":1822}],"flag":"BLOCK","start":12465,"end":13033,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1761},"to":{"change":6,"start":1761,"end":1822},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" match *self.notifiers.borrow_mut() {"},{"Add":" None => {"},{"Add":" bail!(\"map is gone\");"},{"Add":" }"},{"Add":" Some(ref mut v) => {"},{"Add":" assert!(v.insert(cs, tx).is_none());"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" self.in_tx.send(cs)?;"},{"Add":""},{"Add":" v.insert(ChangeData { rx }).rx.clone()"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" rx.changed().await?;"},{"Add":" let res = rx.borrow_and_update().unwrap();"},{"Add":" Ok(res)"}],"del_contents":[{"Del":" shared.task.poll_unpin(cx);\n \n todo!()\n"}]}},{"Replacement":{"inode":{"change":7,"pos":35},"path":"Cargo.lock","line":2533,"ins":{"up_context":[{"change":7,"pos":48913}],"down_context":[{"change":4,"pos":11212}],"flag":"BLOCK","start":13034,"end":13053,"inode":{"change":7,"pos":35}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":48913},"to":{"change":7,"start":11891,"end":11910},"introduced_by":7}],"inode":{"change":7,"pos":35}},"ins_contents":[{"Add":"version = \"0.2.14\""}],"del_contents":[{"Del":"version = \"0.2.13\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":35},"path":"Cargo.lock","line":2535,"ins":{"up_context":[{"change":7,"pos":48996}],"down_context":[{"change":4,"pos":11213}],"flag":"BLOCK","start":13054,"end":13132,"inode":{"change":7,"pos":35}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":48996},"to":{"change":7,"start":11911,"end":11989},"introduced_by":7}],"inode":{"change":7,"pos":35}},"ins_contents":[{"Add":"checksum = \"bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02\""}],"del_contents":[{"Del":"checksum = \"8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58\"\n"}]}}],"owner":"dblsaiko","repo":"pijul","token":"Zt/TLASpPZwB9pnNiM6HDgm9LxjaGt+crTHRSt0O8fM=","login":null}

…

Dependencies

Change contents