{"header":{"message":"Pull code cleanup v1","description":null,"timestamp":"2024-04-07T13:57:07.6624Z","authors":[{}]},"hash":"JGN2BVS5RYX6EFOG7WJGIPTSWG3KE757J5BUGCC64QWCUSXZKZPQC","authors":[{"login":"dblsaiko","key":"CFbqMkwG4nTc9WA817hB7d94hHr5XwgvDXAtY7hfzw8m"}],"deps":{"hashes":[["JGN2BVS5RYX6EFOG7WJGIPTSWG3KE757J5BUGCC64QWCUSXZKZPQC","Pull code cleanup v1"],["AA",null],["JLVRAJA5Z5DNBKHZDLT6QTKJ4LLJ547S4DH7X4A3XTB6234O5XDQC","Using iter_graph in pijul"],["3E2KY6Y4SQ2UO6PLA4K3MQKHIRHSQCBAJIPJT7NQ6BIETMAQX5QAC","Deterministic ordering of pulled patches"],["QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","Formatting + big-endian Sanakirja"],["5Z2Y7VGVHJ7A6UPSEAPFVMIB5J7YHSI6WWHUUUYVLDJ56XSNCXKQC","Migrate `pijul::identity::Complete::prove` to `pijul::remote::prove`"],["G7HJHNFDZCGOPGVETNYK7BDDPJXHEIPGZJEJXBGBXSWPWEX3BIQQC","Migrate from `pijul_interaction::progress` to `pijul_interaction`"],["LKIKT4FRKVZAYITMKO23RRFZG25UFX7J6GBOOUQOD24YBRNLHLOAC","[2/?] Clean up change file name handling"],["Z6ASIMORLV437IEFIUYXIRYSGUTIBMPJNIVF6XQMGRP6WV6R4YPAC","Avoid increasing the download progress bar length if we need the same dependency more than once"],["HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","Solving conflicts"],["OGJFEWHUMFIZYBS456FPNUN3KEUDZXIJNFGPEMJGQDC7INZMHQZQC","Fixing missing dependencies on partial clones"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","Tag synchronisation"],["4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC","Fixing HTTP download"],["JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","Migrate from `pijul::progress` to `pijul_interaction::progress`"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["PYTC7DPVCWKYDXXBY44BBNB4DHZ3N4OQW3EOEQ7H6Z5P5XBG2EIAC","Partial clones: including all the subtree of a directory when selecting patches"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["5XMUEZMZXQ4T4HGZAGBZWT5YKEXOA7IWLZBSREWBHXLMGHXOFXZAC","pijul-clone: avoid panics on parsing remote URLs"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","Pulling more than 100 changes at once"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC","Clean up change file name handling"],["X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","Do not download changes if we already have them"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","Cursors cleanup"],["IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","Improved push/pull reporting"],["C3L2TLQWREYOM3YHL37L7PS74YGLHBEDQRSCVMYIU6HKBEPNN2SAC","When downloading changes, check whether we have their dependencies and download them too"],["ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC","Migrate from `pijul::repository` to `pijul-repository`"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["IBPVOKM5MXTGB2P7LCD75MISAYUNDPEKQAUEVCXJJWLWCX2TJZBAC","Fixing a bug in patch download"],["XQHABMC2FOMH7SZIYVYAR5MNH2DK2AOUCX2RJKZM3PDG2H5JIXYQC","Do not block when there is no patch to pull"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC","Fixing a race condition between progress bars"],["3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","Fixing async issues in downloads"],["BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","Friendlier progress bars"],["4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","Migrate from `pijul::config` to `pijul-config`"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["ZWVYH7WPYOGDKWODFSAJ6R5U64DON2AVVJ2XZJKHAOMLJEFTYF3QC","Pulling local tags"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["A6JQQNNJOW3NKD5LYSBJU43HVSBTL2TP2PZ6J446JJ4CFMI5JOCQC","More appropriate debug messages"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["4XLHUME7YLJV6XUZBOW7PX62TCJXIWW2CPITXO5GZOULWGXRVDZAC","Fixing a interlocking when cloning from a particular patch"]],"deps":["JLVRAJA5Z5DNBKHZDLT6QTKJ4LLJ547S4DH7X4A3XTB6234O5XDQC","3E2KY6Y4SQ2UO6PLA4K3MQKHIRHSQCBAJIPJT7NQ6BIETMAQX5QAC","QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","5Z2Y7VGVHJ7A6UPSEAPFVMIB5J7YHSI6WWHUUUYVLDJ56XSNCXKQC","G7HJHNFDZCGOPGVETNYK7BDDPJXHEIPGZJEJXBGBXSWPWEX3BIQQC","LKIKT4FRKVZAYITMKO23RRFZG25UFX7J6GBOOUQOD24YBRNLHLOAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC","X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","5XMUEZMZXQ4T4HGZAGBZWT5YKEXOA7IWLZBSREWBHXLMGHXOFXZAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","3WO4H2MMMQTYKCPBWYE67IRAEX7DFA2XAOMIKICA6BYDN23K6DQQC","BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","A6JQQNNJOW3NKD5LYSBJU43HVSBTL2TP2PZ6J446JJ4CFMI5JOCQC","IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","DO2Y5TY5JQISUHCVNPI2FXO7WWZVJQ3LGPWF4DNADMGZRIO6PT2QC","ZWVYH7WPYOGDKWODFSAJ6R5U64DON2AVVJ2XZJKHAOMLJEFTYF3QC","4XLHUME7YLJV6XUZBOW7PX62TCJXIWW2CPITXO5GZOULWGXRVDZAC","C3L2TLQWREYOM3YHL37L7PS74YGLHBEDQRSCVMYIU6HKBEPNN2SAC","XQHABMC2FOMH7SZIYVYAR5MNH2DK2AOUCX2RJKZM3PDG2H5JIXYQC","IBPVOKM5MXTGB2P7LCD75MISAYUNDPEKQAUEVCXJJWLWCX2TJZBAC","4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC","Z6ASIMORLV437IEFIUYXIRYSGUTIBMPJNIVF6XQMGRP6WV6R4YPAC","JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC","HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","PYTC7DPVCWKYDXXBY44BBNB4DHZ3N4OQW3EOEQ7H6Z5P5XBG2EIAC","OGJFEWHUMFIZYBS456FPNUN3KEUDZXIJNFGPEMJGQDC7INZMHQZQC","UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC"]},"hunks":[{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":52474}],"down_context":[{"change":8,"pos":853}],"flag":"BLOCK","start":0,"end":64,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":"use std::borrow::Borrow;"},{"Add":"use std::collections::hash_map::Entry;"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":884}],"down_context":[{"change":5,"pos":0}],"flag":"BLOCK","start":65,"end":90,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":"use std::future::Future;"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":6,"ins":{"up_context":[{"change":5,"pos":20}],"down_context":[{"change":8,"pos":10335}],"flag":"BLOCK","start":91,"end":131,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":20},"to":{"change":8,"start":406,"end":438},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":8,"pos":884},"to":{"change":8,"start":406,"end":438},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":406},"to":{"change":8,"start":406,"end":438},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":"use std::path::Path;"},{"Add":"use std::pin::Pin;"}],"del_contents":[{"Del":"use std::path::{Path, PathBuf};\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":10355}],"down_context":[{"change":8,"pos":438}],"flag":"BLOCK","start":132,"end":153,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":"use std::task::Poll;"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":245}],"down_context":[{"change":8,"pos":363}],"flag":"BLOCK","start":154,"end":291,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":"use futures::{pin_mut, Stream};"},{"Add":"use futures_util::stream::{FuturesUnordered, Once};"},{"Add":"use futures_util::{stream, StreamExt, TryStreamExt};"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":17,"ins":{"up_context":[{"change":8,"pos":393}],"down_context":[{"change":8,"pos":0}],"flag":"BLOCK","start":292,"end":384,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":393},"to":{"change":8,"start":2672,"end":2711},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2711},"to":{"change":8,"start":2711,"end":2764},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":""},{"Add":"use crate::context::DownloadContext;"},{"Add":"use libpijul::changestore::{filesystem, ChangeStore};"}],"del_contents":[{"Del":"use libpijul::changestore::filesystem;\n"},{"Del":"use libpijul::changestore::filesystem::fmt_filename;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":24,"ins":{"up_context":[{"change":8,"pos":137}],"down_context":[{"change":8,"pos":138}],"flag":"BLOCK","start":385,"end":487,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":137},"to":{"change":8,"start":52599,"end":52622},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":602},"to":{"change":8,"start":52599,"end":52622},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1128},"to":{"change":8,"start":52599,"end":52622},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":52599},"to":{"change":8,"start":52599,"end":52622},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":"use libpijul::pristine::{ChangePosition, Position};"},{"Add":"use libpijul::{ApplyWorkspace, HashMap, DOT_DIR};"}],"del_contents":[{"Del":"use libpijul::DOT_DIR;\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":28,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":573}],"down_context":[{"change":8,"pos":456}],"flag":"BLOCK","start":488,"end":529,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":"use regex::Regex;"},{"Add":"use tokio::sync::mpsc;"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":44,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":344}],"down_context":[{"change":6,"pos":37}],"flag":"BLOCK","start":530,"end":544,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":"mod context;"},{"Add":""}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1177,"ins":{"up_context":[{"change":8,"pos":66651}],"down_context":[{"change":8,"pos":66691}],"flag":"BLOCK","start":545,"end":576,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66651},"to":{"change":8,"start":10619,"end":10654},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" async fn download_changes("}],"del_contents":[{"Del":" pub async fn download_changes(\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1180,"ins":{"up_context":[{"change":8,"pos":1040}],"down_context":[{"change":8,"pos":3414}],"flag":"BLOCK","start":577,"end":670,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":1040},"to":{"change":8,"start":15968,"end":16031},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":398},"to":{"change":8,"start":15968,"end":16031},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":16031},"to":{"change":8,"start":198,"end":256},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" mut hashes: mpsc::UnboundedReceiver,"},{"Add":" mut send: mpsc::Sender<(CS, bool)>,"}],"del_contents":[{"Del":" hashes: &mut tokio::sync::mpsc::UnboundedReceiver,\n"},{"Del":" send: &mut tokio::sync::mpsc::Sender<(CS, bool)>,\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1188,"ins":{"up_context":[{"change":8,"pos":1087}],"down_context":[{"change":8,"pos":1163}],"flag":"BLOCK","start":671,"end":778,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1087},"to":{"change":8,"start":1087,"end":1163},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" l.download_changes(progress_bar, &mut hashes, &mut send, path)"},{"Add":" .await?"}],"del_contents":[{"Del":" l.download_changes(progress_bar, hashes, send, path).await?\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1192,"ins":{"up_context":[{"change":8,"pos":1851}],"down_context":[{"change":8,"pos":1253}],"flag":"BLOCK","start":779,"end":864,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1851},"to":{"change":8,"start":1178,"end":1253},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" s.download_changes(progress_bar, &mut hashes, &mut send, path, full)"}],"del_contents":[{"Del":" s.download_changes(progress_bar, hashes, send, path, full)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1196,"ins":{"up_context":[{"change":8,"pos":2009}],"down_context":[{"change":8,"pos":1357}],"flag":"BLOCK","start":865,"end":950,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2009},"to":{"change":8,"start":1282,"end":1357},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" h.download_changes(progress_bar, &mut hashes, &mut send, path, full)"}],"del_contents":[{"Del":" h.download_changes(progress_bar, hashes, send, path, full)\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1247,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":1155},"to":{"change":8,"start":2674,"end":2675},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2674},"to":{"change":8,"start":2674,"end":2675},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2675},"to":{"change":8,"start":0,"end":64},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":"\n"},{"Del":" let (mut send, recv) = tokio::sync::mpsc::channel(100);\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1256,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1207},"to":{"change":8,"start":1207,"end":1274},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1274},"to":{"change":8,"start":2676,"end":2757},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1472},"to":{"change":8,"start":1638,"end":1694},"introduced_by":8}],"inode":{"change":8,"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"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1257,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":52},"to":{"change":8,"start":1472,"end":1532},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1694},"to":{"change":8,"start":1472,"end":1532},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2806},"to":{"change":8,"start":1472,"end":1532},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3492},"to":{"change":8,"start":1472,"end":1532},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1472},"to":{"change":8,"start":1472,"end":1532},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1532},"to":{"change":8,"start":1695,"end":1838},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1838},"to":{"change":7,"start":53,"end":87},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":87},"to":{"change":8,"start":1877,"end":1922},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3531},"to":{"change":8,"start":1877,"end":1922},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1877},"to":{"change":8,"start":1877,"end":1922},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1250},"to":{"change":8,"start":1619,"end":1644},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1922},"to":{"change":8,"start":1619,"end":1644},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3024},"to":{"change":8,"start":1619,"end":1644},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1619},"to":{"change":8,"start":1619,"end":1644},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"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"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1258,"ins":{"up_context":[{"change":8,"pos":1924}],"down_context":[{"change":8,"pos":69053}],"flag":"BLOCK","start":951,"end":1001,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":1924},"to":{"change":8,"start":1644,"end":1698},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1644},"to":{"change":8,"start":1644,"end":1698},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" let mut to_apply_inodes = HashSet::new();"}],"del_contents":[{"Del":" Ok::<_, anyhow::Error>(self_)\n });\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1260,"ins":{"up_context":[{"change":8,"pos":69054}],"down_context":[{"change":8,"pos":76}],"flag":"BLOCK","start":1002,"end":1068,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3095},"to":{"change":8,"start":65,"end":94},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":94},"to":{"change":8,"start":0,"end":76},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" {"},{"Add":" let to_apply_inodes = &mut to_apply_inodes;"}],"del_contents":[{"Del":" let mut waiting = 0;\n"},{"Del":" let (send_ready, mut recv_ready) = tokio::sync::mpsc::channel(100);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1263,"ins":{"up_context":[{"change":8,"pos":77}],"down_context":[{"change":8,"pos":126}],"flag":"BLOCK","start":1069,"end":1267,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":77},"to":{"change":8,"start":0,"end":40},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":40},"to":{"change":8,"start":231,"end":259},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":77},"to":{"change":8,"start":231,"end":259},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":94},"to":{"change":8,"start":231,"end":259},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1724},"to":{"change":8,"start":231,"end":259},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3095},"to":{"change":8,"start":231,"end":259},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":231},"to":{"change":8,"start":231,"end":259},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":529},"to":{"change":8,"start":534,"end":544},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":534},"to":{"change":8,"start":534,"end":544},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" self.download_changes_with(download_bar, &changes_dir, false, |cx| async move {"},{"Add":" let stream = download_changes_rec(&cx, repo, to_apply);"},{"Add":" pin_mut!(stream);"}],"del_contents":[{"Del":" let mut asked = HashSet::new();\n"},{"Del":" for h in to_apply {\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1267,"ins":{"up_context":[{"change":8,"pos":127}],"down_context":[{"change":8,"pos":0}],"flag":"BLOCK","start":1268,"end":1498,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127},"to":{"change":8,"start":179,"end":200},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":200},"to":{"change":8,"start":1925,"end":2151},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":164},"to":{"change":8,"start":237,"end":258},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":285},"to":{"change":8,"start":237,"end":258},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2151},"to":{"change":8,"start":237,"end":258},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":237},"to":{"change":8,"start":237,"end":258},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" let mut ws = ApplyWorkspace::new();"},{"Add":""},{"Add":" while let Some(h) = stream.try_next().await? {"},{"Add":" debug!(\"to_apply: {:?}\", h);"},{"Add":""},{"Add":" let mut touches_inodes = inodes.is_empty();"}],"del_contents":[{"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"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1274,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":69755},"to":{"change":8,"start":69755,"end":69809},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":69809},"to":{"change":3,"start":0,"end":50},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":50},"to":{"change":8,"start":286,"end":340},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1454},"to":{"change":8,"start":286,"end":340},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":311},"to":{"change":8,"start":3174,"end":3215},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":340},"to":{"change":8,"start":3174,"end":3215},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":621},"to":{"change":8,"start":3174,"end":3215},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1456},"to":{"change":8,"start":1456,"end":1528},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"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"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1275,"ins":{"up_context":[{"change":8,"pos":1581}],"down_context":[{"change":8,"pos":504}],"flag":"BLOCK","start":1499,"end":2152,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1581},"to":{"change":8,"start":1581,"end":1641},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1641},"to":{"change":8,"start":312,"end":363},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":363},"to":{"change":8,"start":16600,"end":16882},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":16600},"to":{"change":8,"start":16600,"end":16882},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":16882},"to":{"change":8,"start":320,"end":504},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" if !touches_inodes {"},{"Add":" if let CS::Change(ref h) = h {"},{"Add":" let changes = repo.changes.get_changes(h)?;"},{"Add":""},{"Add":" touches_inodes |= 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":" })"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1290,"ins":{"up_context":[{"change":8,"pos":17304}],"down_context":[{"change":8,"pos":17305}],"flag":"BLOCK","start":2153,"end":2980,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":17304},"to":{"change":8,"start":2262,"end":2289},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2262},"to":{"change":8,"start":2262,"end":2289},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if !touches_inodes {"},{"Add":" touches_inodes |= inodes.iter().any(|i| CS::Change(i.change) == h);"},{"Add":" }"},{"Add":""},{"Add":" if !touches_inodes {"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" to_apply_inodes.insert(h);"},{"Add":""},{"Add":" if let Some(apply_bar) = &apply_bar {"},{"Add":" info!(\"Applying {:?}\", h);"},{"Add":" apply_bar.inc(1);"},{"Add":" debug!(\"apply\");"},{"Add":""},{"Add":" if let CS::Change(ref h) = h {"},{"Add":" let mut channel = channel.write();"},{"Add":" txn.apply_change_rec_ws(&repo.changes, &mut channel, h, &mut ws)?;"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"applied\");"}],"del_contents":[{"Del":" })\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1315,"ins":{"up_context":[{"change":8,"pos":17334}],"down_context":[{"change":8,"pos":17364}],"flag":"BLOCK","start":2981,"end":3036,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":17334},"to":{"change":8,"start":17334,"end":17364},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" debug!(\"not applying {:?}\", h)"}],"del_contents":[{"Del":" false\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1318,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2330},"to":{"change":8,"start":364,"end":437},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" || { inodes.iter().any(|i| CS::Change(i.change) == h) };\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1319,"ins":{"up_context":[{"change":8,"pos":2393}],"down_context":[{"change":3,"pos":109}],"flag":"BLOCK","start":3037,"end":3096,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2393},"to":{"change":8,"start":2393,"end":2425},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2425},"to":{"change":3,"start":51,"end":94},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":94},"to":{"change":8,"start":2467,"end":2528},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":8,"pos":479},"to":{"change":8,"start":2467,"end":2528},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2467},"to":{"change":8,"start":2467,"end":2528},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2528},"to":{"change":8,"start":2528,"end":2529},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2529},"to":{"change":6,"start":144,"end":201},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":201},"to":{"change":8,"start":972,"end":1015},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1292},"to":{"change":8,"start":972,"end":1015},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2209},"to":{"change":8,"start":972,"end":1015},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3500},"to":{"change":8,"start":972,"end":1015},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":972},"to":{"change":8,"start":972,"end":1015},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1015},"to":{"change":8,"start":2210,"end":2244},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":221},"to":{"change":8,"start":3567,"end":3600},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1355},"to":{"change":8,"start":3567,"end":3600},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2244},"to":{"change":8,"start":3567,"end":3600},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3567},"to":{"change":8,"start":3567,"end":3600},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3600},"to":{"change":8,"start":17462,"end":17560},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":17560},"to":{"change":8,"start":480,"end":568},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":568},"to":{"change":8,"start":17643,"end":17661},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":17643},"to":{"change":8,"start":17643,"end":17661},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":139},"to":{"change":8,"start":3601,"end":3636},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":17661},"to":{"change":8,"start":3601,"end":3636},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7732},"to":{"change":8,"start":3601,"end":3636},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3636},"to":{"change":8,"start":70594,"end":70662},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7732},"to":{"change":8,"start":70594,"end":70662},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70594},"to":{"change":8,"start":70594,"end":70662},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70662},"to":{"change":3,"start":95,"end":109},"introduced_by":3}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" Ok(())"},{"Add":" })"},{"Add":" .await?;"}],"del_contents":[{"Del":" if touches_inodes {\n"},{"Del":" to_apply_inodes.insert(h);\n"},{"Del":" } else {\n continue;\n }\n"},{"Del":"\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"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1332,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70716},"to":{"change":8,"start":700,"end":747},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":747},"to":{"change":8,"start":294,"end":321},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70716},"to":{"change":8,"start":294,"end":321},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":321},"to":{"change":8,"start":569,"end":588},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" debug!(\"waiting for spawned process\");\n"},{"Del":" *self = t.await??;\n"},{"Del":" u.await??;\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1333,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":314},"to":{"change":8,"start":70874,"end":70880},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2558},"to":{"change":8,"start":70874,"end":70880},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70874},"to":{"change":8,"start":70874,"end":70880},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2661},"to":{"change":8,"start":2661,"end":2662},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2662},"to":{"change":8,"start":2662,"end":3005},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3005},"to":{"change":8,"start":3005,"end":3023},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3023},"to":{"change":8,"start":3023,"end":3084},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3084},"to":{"change":8,"start":3084,"end":3116},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3116},"to":{"change":8,"start":480,"end":520},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":520},"to":{"change":8,"start":3116,"end":3188},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3116},"to":{"change":8,"start":3116,"end":3188},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3188},"to":{"change":8,"start":3188,"end":3202},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3202},"to":{"change":8,"start":3202,"end":3243},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3243},"to":{"change":8,"start":3243,"end":3262},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3262},"to":{"change":8,"start":3262,"end":3274},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3274},"to":{"change":8,"start":479,"end":493},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" }\n"},{"Del":"\n"},{"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"},{"Del":" }\n"},{"Del":" if waiting == 0 {\n break;\n"},{"Del":" }\n }\n"},{"Del":" info!(\"waiting loop done\");\n"},{"Del":" for r in ready {\n send_ready.send(r).await?;\n"},{"Del":" }\n"},{"Del":" std::mem::drop(recv_signal);\n"},{"Del":" Ok(())\n"},{"Del":" });\n"},{"Del":" Ok(t)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1337,"ins":{"up_context":[{"change":8,"pos":70953}],"down_context":[{"change":8,"pos":70984}],"flag":"BLOCK","start":3097,"end":3124,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70953},"to":{"change":8,"start":70953,"end":70984},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" repo: &Repository,"}],"del_contents":[{"Del":" repo: &mut Repository,\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1339,"ins":{"up_context":[{"change":8,"pos":71005}],"down_context":[{"change":8,"pos":71042}],"flag":"BLOCK","start":3125,"end":3158,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71005},"to":{"change":8,"start":71005,"end":71042},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1342,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71183},"to":{"change":8,"start":3692,"end":3773},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3773},"to":{"change":8,"start":3310,"end":3388},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3388},"to":{"change":8,"start":71319,"end":71386},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71319},"to":{"change":8,"start":71319,"end":71386},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71386},"to":{"change":7,"start":88,"end":140},"introduced_by":7}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" let (send_hash, mut recv_hash) = tokio::sync::mpsc::unbounded_channel();\n"},{"Del":" let (mut send_signal, recv_signal) = tokio::sync::mpsc::channel(100);\n"},{"Del":" let mut self_ = std::mem::replace(self, RemoteRepo::None);\n"},{"Del":" let changes_dir = repo.changes_dir.clone();\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1343,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2453},"to":{"change":8,"start":2453,"end":2509},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" let cloned_download_bar = download_bar.clone();\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1344,"ins":{"up_context":[{"change":8,"pos":2510}],"down_context":[{"change":8,"pos":71942}],"flag":"BLOCK","start":3159,"end":3196,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":1734},"to":{"change":8,"start":71386,"end":71428},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2510},"to":{"change":8,"start":71386,"end":71428},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3446},"to":{"change":8,"start":71386,"end":71428},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3830},"to":{"change":8,"start":71386,"end":71428},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71386},"to":{"change":8,"start":71386,"end":71428},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71428},"to":{"change":8,"start":1849,"end":1867},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1867},"to":{"change":8,"start":3831,"end":3866},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3866},"to":{"change":8,"start":2511,"end":2552},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1762},"to":{"change":8,"start":3910,"end":3984},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2552},"to":{"change":8,"start":3910,"end":3984},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3910},"to":{"change":8,"start":3910,"end":3984},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3984},"to":{"change":7,"start":141,"end":175},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":175},"to":{"change":8,"start":4023,"end":4068},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":4023},"to":{"change":8,"start":4023,"end":4068},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4068},"to":{"change":8,"start":1961,"end":1986},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1961},"to":{"change":8,"start":1961,"end":1986},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1986},"to":{"change":8,"start":71908,"end":71942},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71908},"to":{"change":8,"start":71908,"end":71942},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" let mut hashes = Vec::new();"}],"del_contents":[{"Del":" let t = tokio::spawn(async move {\n"},{"Del":" self_\n"},{"Del":" .download_changes(\n"},{"Del":" cloned_download_bar,\n"},{"Del":" &mut recv_hash,\n &mut send_signal,\n"},{"Del":" &changes_dir,\n"},{"Del":" false,\n )\n"},{"Del":" .await?;\n"},{"Del":" Ok(self_)\n });\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1346,"ins":{"up_context":[{"change":8,"pos":71943}],"down_context":[{"change":8,"pos":494}],"flag":"BLOCK","start":3197,"end":3278,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71943},"to":{"change":8,"start":316,"end":345},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":345},"to":{"change":8,"start":521,"end":561},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":345},"to":{"change":8,"start":71943,"end":71974},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":561},"to":{"change":8,"start":71943,"end":71974},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71943},"to":{"change":8,"start":71943,"end":71974},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71974},"to":{"change":8,"start":346,"end":372},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":372},"to":{"change":8,"start":17662,"end":17706},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71974},"to":{"change":8,"start":17662,"end":17706},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":17706},"to":{"change":8,"start":562,"end":603},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":603},"to":{"change":8,"start":72012,"end":72022},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4101},"to":{"change":8,"start":72012,"end":72022},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":17706},"to":{"change":8,"start":72012,"end":72022},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72012},"to":{"change":8,"start":72012,"end":72022},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" {"},{"Add":" let txn = &mut *txn;"},{"Add":" let hashes = &mut hashes;"}],"del_contents":[{"Del":" let mut waiting = 0;\n"},{"Del":" let mut asked = HashSet::new();\n"},{"Del":" for &h in tag.iter() {\n"},{"Del":" waiting += 1;\n"},{"Del":" send_hash.send(CS::Change(h))?;\n"},{"Del":" asked.insert(CS::Change(h));\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1350,"ins":{"up_context":[{"change":8,"pos":495}],"down_context":[{"change":8,"pos":571}],"flag":"BLOCK","start":3279,"end":3509,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":495},"to":{"change":8,"start":495,"end":571},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" self.download_changes_with(download_bar, &repo.changes_dir, false, |cx| async move {"},{"Add":" let stream = download_changes_rec(&cx, repo, tag.iter().cloned().map(CS::Change));"},{"Add":" pin_mut!(stream);"}],"del_contents":[{"Del":" let (send_ready, mut recv_ready) = tokio::sync::mpsc::channel(100);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1354,"ins":{"up_context":[{"change":8,"pos":572}],"down_context":[{"change":8,"pos":72022}],"flag":"BLOCK","start":3510,"end":3562,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":572},"to":{"change":8,"start":572,"end":593},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":593},"to":{"change":8,"start":2553,"end":2786},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":4,"pos":445},"to":{"change":8,"start":3566,"end":3587},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":8,"pos":685},"to":{"change":8,"start":3566,"end":3587},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":703},"to":{"change":8,"start":3566,"end":3587},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2786},"to":{"change":8,"start":3566,"end":3587},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3566},"to":{"change":8,"start":3566,"end":3587},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" let mut ws = ApplyWorkspace::new();"}],"del_contents":[{"Del":" let u = self\n"},{"Del":" .download_changes_rec(\n repo,\n send_hash,\n recv_signal,\n send_ready,\n download_bar,\n waiting,\n asked,\n )\n"},{"Del":" .await?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1356,"ins":{"up_context":[{"change":8,"pos":72023}],"down_context":[{"change":8,"pos":18439}],"flag":"BLOCK","start":3563,"end":3892,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72079},"to":{"change":8,"start":72079,"end":72116},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72752},"to":{"change":8,"start":72752,"end":72806},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72806},"to":{"change":8,"start":140,"end":150},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":150},"to":{"change":8,"start":530,"end":578},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":578},"to":{"change":8,"start":3588,"end":3702},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3702},"to":{"change":8,"start":1312,"end":1403},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":18352},"to":{"change":8,"start":1312,"end":1403},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" while let Some(cs) = stream.try_next().await? {"},{"Add":" if let CS::Change(hash) = cs {"},{"Add":" let mut channel = channel.write();"},{"Add":" txn.apply_change_rec_ws(&repo.changes, &mut channel, &hash, &mut ws)?;"},{"Add":" }"},{"Add":""},{"Add":" hashes.push(cs);"}],"del_contents":[{"Del":" let mut hashes = Vec::new();\n"},{"Del":" let mut ws = libpijul::ApplyWorkspace::new();\n"},{"Del":" {\n"},{"Del":" let mut channel_ = channel.write();\n"},{"Del":" while let Some(hash) = recv_ready.recv().await {\n if let CS::Change(ref hash) = hash {\n"},{"Del":" txn.apply_change_rec_ws(&repo.changes, &mut channel_, hash, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1364,"ins":{"up_context":[{"change":8,"pos":18457}],"down_context":[{"change":8,"pos":72925}],"flag":"BLOCK","start":3893,"end":3953,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":18457},"to":{"change":8,"start":3703,"end":3738},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3738},"to":{"change":8,"start":330,"end":344},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":18457},"to":{"change":8,"start":330,"end":344},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":330},"to":{"change":8,"start":330,"end":344},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .await?;"}],"del_contents":[{"Del":" hashes.push(hash);\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1369,"ins":{"up_context":[{"change":8,"pos":72935}],"down_context":[{"change":8,"pos":1873}],"flag":"BLOCK","start":3954,"end":3955,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72935},"to":{"change":8,"start":72935,"end":73007},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":73007},"to":{"change":8,"start":3739,"end":3758},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" let r: Result<_, anyhow::Error> = t.await?;\n *self = r?;\n"},{"Del":" u.await??;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1416,"ins":{"up_context":[{"change":8,"pos":74912}],"down_context":[{"change":8,"pos":18509}],"flag":"BLOCK","start":3956,"end":3995,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":74912},"to":{"change":8,"start":74912,"end":74955},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" local_channel: &ChannelRef,"}],"del_contents":[{"Del":" local_channel: &mut ChannelRef,\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1421,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":2107},"to":{"change":8,"start":75038,"end":75086},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":75038},"to":{"change":8,"start":75038,"end":75086},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":75086},"to":{"change":8,"start":4141,"end":4222},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":917},"to":{"change":8,"start":75164,"end":75307},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4222},"to":{"change":8,"start":75164,"end":75307},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":75164},"to":{"change":8,"start":75164,"end":75307},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":75307},"to":{"change":7,"start":176,"end":228},"introduced_by":7}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" use libpijul::changestore::ChangeStore;\n"},{"Del":" let (send_hash, mut recv_hash) = tokio::sync::mpsc::unbounded_channel();\n"},{"Del":" let (mut send_sig, mut recv_sig) = tokio::sync::mpsc::channel(100);\n let mut self_ = std::mem::replace(self, RemoteRepo::None);\n"},{"Del":" let changes_dir = repo.changes_dir.clone();\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1424,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2902},"to":{"change":8,"start":2902,"end":3077},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3077},"to":{"change":6,"start":289,"end":327},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":327},"to":{"change":8,"start":3112,"end":3191},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3112},"to":{"change":8,"start":3112,"end":3191},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3191},"to":{"change":7,"start":229,"end":267},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":267},"to":{"change":8,"start":3233,"end":3376},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3233},"to":{"change":8,"start":3233,"end":3376},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" let t: tokio::task::JoinHandle> =\n tokio::spawn(async move {\n self_\n .download_changes(\n"},{"Del":" download_bar,\n"},{"Del":" &mut recv_hash,\n &mut send_sig,\n"},{"Del":" &changes_dir,\n"},{"Del":" true,\n )\n .await?;\n Ok::<_, anyhow::Error>(self_)\n });\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1425,"ins":{"up_context":[{"change":8,"pos":76077}],"down_context":[{"change":8,"pos":76247}],"flag":"BLOCK","start":3996,"end":5585,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76077},"to":{"change":8,"start":76077,"end":76104},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76104},"to":{"change":8,"start":530,"end":600},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":600},"to":{"change":8,"start":7945,"end":8102},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":18666},"to":{"change":8,"start":7945,"end":8102},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76104},"to":{"change":8,"start":7945,"end":8102},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":8102},"to":{"change":8,"start":76173,"end":76247},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":9560},"to":{"change":8,"start":76173,"end":76247},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76173},"to":{"change":8,"start":76173,"end":76247},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" self.download_changes_with(download_bar, &repo.changes_dir, true, |cx| async move {"},{"Add":" let mut waiting = Vec::new();"},{"Add":""},{"Add":" for c in changes {"},{"Add":" let CS::Change(c) = c else { continue };"},{"Add":""},{"Add":" let sc = c.into();"},{"Add":""},{"Add":" if repo"},{"Add":" .changes"},{"Add":" .has_contents(*c, txn.get_internal(&sc)?.cloned())"},{"Add":" {"},{"Add":" debug!(\"has contents {:?}\", c);"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" if full {"},{"Add":" waiting.push(cx.download(CS::Change(*c))?);"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" let Some(&change) = txn.get_internal(&sc)? else {"},{"Add":" debug!(\"could not find internal for {:?}\", sc);"},{"Add":" continue;"},{"Add":" };"},{"Add":""},{"Add":" // Check if at least one non-empty vertex from c is still alive."},{"Add":" let v = libpijul::pristine::Vertex {"},{"Add":" change,"},{"Add":" start: ChangePosition(0u64.into()),"},{"Add":" end: ChangePosition(0u64.into()),"},{"Add":" };"},{"Add":""},{"Add":" let channel = local_channel.read();"},{"Add":" let graph = txn.graph(&channel);"},{"Add":""},{"Add":" for x in txn.iter_graph(graph, Some(&v))? {"},{"Add":" let (v, e) = x?;"},{"Add":" if v.change > change {"},{"Add":" break;"},{"Add":" } else if e.flag().is_alive_parent() {"},{"Add":" waiting.push(cx.download(CS::Change(*c))?);"},{"Add":" break;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" for c in changes {\n"},{"Del":" let c = if let CS::Change(c) = c { c } else { continue };\n"},{"Del":" let sc = c.into();\n if repo\n .changes\n .has_contents(*c, txn.get_internal(&sc)?.cloned())\n {\n"},{"Del":" debug!(\"has contents {:?}\", c);\n continue;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1471,"ins":{"up_context":[{"change":8,"pos":76261}],"down_context":[{"change":8,"pos":76429}],"flag":"BLOCK","start":5586,"end":5644,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76261},"to":{"change":8,"start":76261,"end":76328},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2574},"to":{"change":8,"start":76371,"end":76429},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4550},"to":{"change":8,"start":76371,"end":76429},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76371},"to":{"change":8,"start":76371,"end":76429},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" for w in waiting {"},{"Add":" w.await?;"}],"del_contents":[{"Del":" if full {\n debug!(\"sending send_hash\");\n"},{"Del":" debug!(\"sent\");\n continue;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1475,"ins":{"up_context":[{"change":8,"pos":76443}],"down_context":[{"change":8,"pos":77704}],"flag":"BLOCK","start":5645,"end":5694,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76443},"to":{"change":8,"start":8103,"end":8171},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":8171},"to":{"change":8,"start":76508,"end":76547},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":9627},"to":{"change":8,"start":76508,"end":76547},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76508},"to":{"change":8,"start":76508,"end":76547},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76547},"to":{"change":8,"start":2283,"end":2347},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2347},"to":{"change":8,"start":76547,"end":76738},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76547},"to":{"change":8,"start":76547,"end":76738},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76738},"to":{"change":8,"start":8172,"end":8314},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":8314},"to":{"change":8,"start":76860,"end":76875},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76860},"to":{"change":8,"start":76860,"end":76875},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76875},"to":{"change":8,"start":642,"end":690},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":690},"to":{"change":8,"start":2348,"end":2393},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":735},"to":{"change":8,"start":2348,"end":2393},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76925},"to":{"change":8,"start":2348,"end":2393},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2393},"to":{"change":2,"start":0,"end":56},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":56},"to":{"change":8,"start":2518,"end":2672},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2518},"to":{"change":8,"start":2518,"end":2672},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2672},"to":{"change":8,"start":18717,"end":18770},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2645},"to":{"change":8,"start":2719,"end":2746},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4592},"to":{"change":8,"start":2719,"end":2746},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2719},"to":{"change":8,"start":2719,"end":2746},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2746},"to":{"change":8,"start":2746,"end":2764},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":942},"to":{"change":8,"start":77531,"end":77545},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2764},"to":{"change":8,"start":77531,"end":77545},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":77531},"to":{"change":8,"start":77531,"end":77545},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":77545},"to":{"change":8,"start":77545,"end":77704},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .await?;"},{"Add":""}],"del_contents":[{"Del":" let change = if let Some(&i) = txn.get_internal(&sc)? {\n"},{"Del":" i\n } else {\n"},{"Del":" debug!(\"could not find internal for {:?}\", sc);\n"},{"Del":" continue;\n };\n // Check if at least one non-empty vertex from c is still alive.\n let v = libpijul::pristine::Vertex {\n change,\n"},{"Del":" start: libpijul::pristine::ChangePosition(0u64.into()),\n end: libpijul::pristine::ChangePosition(0u64.into()),\n"},{"Del":" };\n"},{"Del":" let channel = local_channel.read();\n"},{"Del":" let graph = txn.graph(&channel);\n"},{"Del":" for x in txn.iter_graph(graph, Some(&v))? {\n"},{"Del":" let (v, e) = x?;\n if v.change > change {\n break;\n } else if e.flag().is_alive_parent() {\n"},{"Del":" send_hash.send(CS::Change(*c))?;\n"},{"Del":" break;\n"},{"Del":" }\n"},{"Del":" }\n"},{"Del":" }\n debug!(\"dropping send_hash\");\n std::mem::drop(send_hash);\n while recv_sig.recv().await.is_some() {}\n *self = t.await??;\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1513,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":78608},"to":{"change":8,"start":2910,"end":2980},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2980},"to":{"change":8,"start":2980,"end":2981},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":"use libpijul::pristine::{ChangePosition, Position};\nuse regex::Regex;\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1605,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":20381}],"down_context":[{"change":8,"pos":79731}],"flag":"BLOCK","start":5695,"end":6060,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":"}"},{"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":" })"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1622,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":76328},"to":{"change":8,"start":18667,"end":18716},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"contents":[{"Del":" send_hash.send(CS::Change(*c))?;\n"}]}},{"SolveOrderConflict":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1622,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":79733}],"down_context":[],"flag":"","start":6061,"end":6061,"inode":{"change":8,"pos":52474}}},"contents":[]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1622,"atom":{"NewVertex":{"up_context":[{"change":0,"pos":6061}],"down_context":[{"change":8,"pos":589}],"flag":"BLOCK","start":6062,"end":7077,"inode":{"change":8,"pos":52474}}},"contents":[{"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("},{"Add":" self: Pin<&mut Self>,"},{"Add":" cx: &mut std::task::Context<'_>,"},{"Add":" ) -> 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":"}"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1664,"ins":{"up_context":[{"change":8,"pos":590}],"down_context":[{"change":8,"pos":3629}],"flag":"BLOCK","start":7078,"end":7378,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":590},"to":{"change":8,"start":590,"end":625},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":625},"to":{"change":8,"start":625,"end":644},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":644},"to":{"change":8,"start":644,"end":800},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":800},"to":{"change":8,"start":341,"end":392},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":392},"to":{"change":8,"start":2245,"end":2280},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2280},"to":{"change":8,"start":822,"end":850},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":822},"to":{"change":8,"start":822,"end":850},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":850},"to":{"change":8,"start":165,"end":197},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":197},"to":{"change":8,"start":393,"end":478},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":850},"to":{"change":8,"start":393,"end":478},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":478},"to":{"change":8,"start":3534,"end":3586},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3586},"to":{"change":8,"start":1209,"end":1295},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1209},"to":{"change":8,"start":1209,"end":1295},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1295},"to":{"change":8,"start":3587,"end":3629},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":"fn download_changes_rec<'a, I>("},{"Add":" cx: &'a DownloadContext,"},{"Add":" repo: &'a Repository,"},{"Add":" items: I,"},{"Add":") -> impl Stream> + 'a"},{"Add":"where"},{"Add":" I: IntoIterator + 'a,"},{"Add":" I::Item: Borrow,"},{"Add":"{"},{"Add":" try_stream(move |sender| async move {"},{"Add":" let mut tasks = FuturesUnordered::new();"}],"del_contents":[{"Del":" async fn download_changes_rec(\n"},{"Del":" &mut self,\n"},{"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"},{"Del":" progress_bar: ProgressBar,\n"},{"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":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1676,"ins":{"up_context":[{"change":8,"pos":3630}],"down_context":[{"change":8,"pos":60}],"flag":"BLOCK","start":7379,"end":7885,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":3630},"to":{"change":8,"start":0,"end":30},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1295},"to":{"change":8,"start":0,"end":30},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":30},"to":{"change":8,"start":2281,"end":2312},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" // there is probably a way to model this using futures, but I"},{"Add":" // couldn't find a nice way to do it"},{"Add":" // so here, have three funny collections"},{"Add":""},{"Add":" let mut pending_deps = HashMap::>::new();"},{"Add":" let mut rev_deps = HashMap::>::new();"},{"Add":" let mut fetched = HashSet::new();"},{"Add":""},{"Add":" let make_download_job = |cs| async move {"},{"Add":" match cx.download(cs) {"},{"Add":" Ok(v) => (cs, v.await),"},{"Add":" Err(e) => (cs, Err(e)),"}],"del_contents":[{"Del":" if waiting == 0 {\n"},{"Del":" return Ok(());\n"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1689,"ins":{"up_context":[{"change":8,"pos":74}],"down_context":[{"change":8,"pos":1956}],"flag":"BLOCK","start":7886,"end":7897,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":74},"to":{"change":8,"start":1295,"end":1407},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1295},"to":{"change":8,"start":1295,"end":1407},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1407},"to":{"change":8,"start":198,"end":258},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":258},"to":{"change":8,"start":1407,"end":1522},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1407},"to":{"change":8,"start":1407,"end":1522},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1702},"to":{"change":8,"start":1702,"end":1956},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" };"}],"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":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1691,"ins":{"up_context":[{"change":8,"pos":1957}],"down_context":[{"change":8,"pos":70880}],"flag":"BLOCK","start":7898,"end":8014,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1957},"to":{"change":8,"start":3631,"end":3718},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3718},"to":{"change":8,"start":2056,"end":2136},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2056},"to":{"change":8,"start":2056,"end":2136},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" for item in items {"},{"Add":" let item = *item.borrow();"},{"Add":" tasks.push(make_download_job(item));"}],"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"}]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1695,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70881},"to":{"change":8,"start":2229,"end":2321},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2403},"to":{"change":8,"start":259,"end":326},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":326},"to":{"change":8,"start":2313,"end":2370},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":86},"to":{"change":8,"start":326,"end":479},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2370},"to":{"change":8,"start":326,"end":479},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":326},"to":{"change":8,"start":326,"end":479},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":479},"to":{"change":8,"start":2514,"end":2570},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2514},"to":{"change":8,"start":2514,"end":2570},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":259},"to":{"change":8,"start":78,"end":118},"introduced_by":8}],"inode":{"change":8,"pos":52474}}},"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"},{"Del":" debug!(\"to_apply {:?}\", h);\n"}]}},{"SolveOrderConflict":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1695,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":70881}],"down_context":[],"flag":"","start":8015,"end":8015,"inode":{"change":8,"pos":52474}}},"contents":[]}},{"Edit":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1695,"atom":{"NewVertex":{"up_context":[{"change":0,"pos":8015}],"down_context":[{"change":8,"pos":3532}],"flag":"BLOCK","start":8016,"end":8136,"inode":{"change":8,"pos":52474}}},"contents":[{"Add":" if let CS::Change(hash) = item {"},{"Add":" rev_deps.insert(hash, Vec::new());"},{"Add":" }"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":8,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1700,"ins":{"up_context":[{"change":8,"pos":3533}],"down_context":[],"flag":"BLOCK","start":8137,"end":10238,"inode":{"change":8,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":3533},"to":{"change":8,"start":41,"end":71},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":454},"to":{"change":8,"start":41,"end":71},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":71},"to":{"change":8,"start":119,"end":178},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":454},"to":{"change":8,"start":119,"end":178},"introduced_by":8}],"inode":{"change":8,"pos":52474}},"ins_contents":[{"Add":" while let Some((cs, res)) = tasks.next().await {"},{"Add":" debug!(\"{:?} finished downloading (result: {:?})\", cs, &res);"},{"Add":""},{"Add":" let follow = res?;"},{"Add":""},{"Add":" let CS::Change(hash) = cs else {"},{"Add":" debug!(\"it is not a change, we're done\");"},{"Add":" sender.send(Ok(cs)).await?;"},{"Add":" continue;"},{"Add":" };"},{"Add":""},{"Add":" fetched.insert(hash);"},{"Add":""},{"Add":" // first, populate our dependencies"},{"Add":""},{"Add":" if follow {"},{"Add":" info!(\"{:?}\", hash);"},{"Add":" let pending_deps = match pending_deps.entry(hash) {"},{"Add":" Entry::Occupied(_) => unreachable!(),"},{"Add":" Entry::Vacant(v) => v.insert(Default::default()),"},{"Add":" };"},{"Add":""},{"Add":" for dep in repo.changes.get_dependencies(&hash)? {"},{"Add":" if !fetched.contains(&dep) {"},{"Add":" pending_deps.insert(dep);"},{"Add":" }"},{"Add":""},{"Add":" rev_deps.entry(dep).or_insert_with(|| {"},{"Add":" tasks.push(make_download_job(CS::Change(dep)));"},{"Add":" Default::default()"},{"Add":" });"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" // then, send completed changes (including parents of this) to"},{"Add":" // our caller"},{"Add":""},{"Add":" let mut to_check = vec![hash];"},{"Add":""},{"Add":" while let Some(hash) = to_check.pop() {"},{"Add":" if let Some(pending_deps) = pending_deps.get(&hash) {"},{"Add":" if !pending_deps.is_empty() {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" // this change has no pending dependencies => it is complete"},{"Add":" sender.send(Ok(CS::Change(hash))).await?;"},{"Add":""},{"Add":" // other changes may be complete if this was the last"},{"Add":" // missing dependency, propagate"},{"Add":" for dep in rev_deps.get(&hash).into_iter().flatten() {"},{"Add":" if let Some(p) = pending_deps.get_mut(dep) {"},{"Add":" assert!(p.remove(dep));"},{"Add":" to_check.push(*dep);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" })"},{"Add":"}"}],"del_contents":[{"Del":" asked.insert(*h);\n"},{"Del":" hash_send.send(*h)?;\n waiting += 1;\n"}]}}],"owner":"dblsaiko","repo":"pijul","token":"O88erwb5tYwvgBH0F7MKl0Rt8HBpnNZvcslk8T1Gfx0=","login":null}

…

Dependencies

Change contents