{"header":{"message":"Improved push/pull reporting","description":null,"timestamp":"2021-07-29T22:15:28.002227Z","authors":[{}]},"hash":"IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","authors":[{"login":"ammkrn","key":"8pRcgpBDWybJEh4eZbHW8iV75uVLVJ5dkoYnwL7kkMgE"}],"deps":{"hashes":[["IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","Improved push/pull reporting"],["AA",null],["OP77HLKNGBOHKHNGITIL4U6FAFUNZRPORJRCFXOJJE5DI5WO5S4QC","Pushing files in the correct order"],["QZ77NIXCOQDZJTTVQNN22CAZSMRPGVOZAW4X6RKIZ534UG4XCWEQC","Actually downloading changelists from channels without an id"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","Do not output files introduced by patches that were not applied during a push"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","Fixing a bus error when starting a transaction on a full disk"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","Don't output after pushing to a local channel"],["5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","push/pull: fixed \"changes\" arguments"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","Version bump + formatting"],["QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","Reset: only output changed files"],["BBKV6VMN4EVBCBSAQMTL2TARBBSQEZGRCXMTKYUIDOJ3HZISUP7AC","Fixing push/pull messages, and do not reverse the changes to download/upload"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["YS2HLPX6S3FCPI3Q7TVFP3XIZPK4JRKV6PFWRNZHCWWC2P2SDDLQC","Don't propose an empty list of changes to push"],["367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","Forwarding SSH stderr, and progress bar for push"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","Completing dependencies only with changes the remote does not have"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["5XMUEZMZXQ4T4HGZAGBZWT5YKEXOA7IWLZBSREWBHXLMGHXOFXZAC","pijul-clone: avoid panics on parsing remote URLs"],["5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC","Fixing a race condition between progress bars"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","Complete dependencies when pushing and pulling"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC","Downloading changelists from channels without an id (Nest discussions)"],["CVLQ7DBFTJCA63F7Z4GB5OZXMKRFA4KGHGQT523HNVMELP2EPJBQC","Committing the remotes even if we do not push anything"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Fix some mistakes in the docs"]],"deps":["OP77HLKNGBOHKHNGITIL4U6FAFUNZRPORJRCFXOJJE5DI5WO5S4QC","QZ77NIXCOQDZJTTVQNN22CAZSMRPGVOZAW4X6RKIZ534UG4XCWEQC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","YS2HLPX6S3FCPI3Q7TVFP3XIZPK4JRKV6PFWRNZHCWWC2P2SDDLQC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","VMPAOJS2ZFOLNXALHWSVM5AFENWX6ZUACB45EJV3HXI7DQNAZPHQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC","BBKV6VMN4EVBCBSAQMTL2TARBBSQEZGRCXMTKYUIDOJ3HZISUP7AC","BE7GUCI2N6TX3P2HRMFSH7XLJKILDPOKOXKA7HWOABBFNKCKMZLAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","5XMUEZMZXQ4T4HGZAGBZWT5YKEXOA7IWLZBSREWBHXLMGHXOFXZAC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","CVLQ7DBFTJCA63F7Z4GB5OZXMKRFA4KGHGQT523HNVMELP2EPJBQC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC"]},"hunks":[{"Replacement":{"inode":{"change":5,"pos":52474},"path":"pijul/src/remote/mod.rs","line":7,"ins":{"up_context":[{"change":5,"pos":393}],"down_context":[{"change":5,"pos":52599}],"flag":"BLOCK","start":0,"end":137,"inode":{"change":5,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":393},"to":{"change":5,"start":1031,"end":1128},"introduced_by":5}],"inode":{"change":5,"pos":52474}},"ins_contents":[{"Add":"use libpijul::pristine::{"},{"Add":" sanakirja::MutTxn, Base32, ChangeId, ChannelRef, GraphIter, Hash, Merkle, MutTxnT, RemoteRef,"},{"Add":" TxnT,"},{"Add":"};"}],"del_contents":[{"Del":"use libpijul::pristine::{Base32, ChannelRef, GraphIter, Hash, Merkle, MutTxnT, RemoteRef, TxnT};\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52474},"path":"pijul/src/remote/mod.rs","line":12,"ins":{"up_context":[{"change":5,"pos":52622}],"down_context":[{"change":5,"pos":549}],"flag":"BLOCK","start":138,"end":209,"inode":{"change":5,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":52622},"to":{"change":5,"start":52622,"end":52659},"introduced_by":5}],"inode":{"change":5,"pos":52474}},"ins_contents":[{"Add":"use libpijul::{ChannelTxnT, DepsTxnT, GraphTxnT, MutTxnTExt, TxnTExt};"}],"del_contents":[{"Del":"use libpijul::{MutTxnTExt, TxnTExt};\n"}]}},{"Edit":{"inode":{"change":5,"pos":52474},"path":"pijul/src/remote/mod.rs","line":112,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":8343}],"down_context":[{"change":5,"pos":1063}],"flag":"BLOCK","start":210,"end":7445,"inode":{"change":5,"pos":52474}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"// Extracting this saves a little bit of duplication."},{"Add":"fn get_local_inodes("},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" channel: &ChannelRef>,"},{"Add":" repo: &Repository,"},{"Add":" path: &[String],"},{"Add":") -> Result>, anyhow::Error> {"},{"Add":" let mut paths = HashSet::new();"},{"Add":" for path in path.iter() {"},{"Add":" let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, path)?;"},{"Add":" if ambiguous {"},{"Add":" bail!(\"Ambiguous path: {:?}\", path)"},{"Add":" }"},{"Add":" paths.insert(p);"},{"Add":" paths.extend("},{"Add":" libpijul::fs::iter_graph_descendants(txn, &channel.read().graph, p)?"},{"Add":" .map(|x| x.unwrap()),"},{"Add":" );"},{"Add":" }"},{"Add":" Ok(paths)"},{"Add":"}"},{"Add":""},{"Add":"/// Embellished [`RemoteDelta`] that has information specific"},{"Add":"/// to a push operation. We want to know what our options are"},{"Add":"/// for changes to upload, whether the remote has unrecorded relevant changes,"},{"Add":"/// and whether the remote has changes we don't know about, since those might"},{"Add":"/// effect whether or not we actually want to go through with the push."},{"Add":"pub(crate) struct PushDelta {"},{"Add":" pub to_upload: Vec,"},{"Add":" pub remote_ref: Option>,"},{"Add":" pub remote_unrecs: Vec<(u64, Hash)>,"},{"Add":" pub unknown_changes: Vec,"},{"Add":"}"},{"Add":""},{"Add":"/// For a [`RemoteRepo`] that's Local, Ssh, or Http"},{"Add":"/// (anything other than a LocalChannel),"},{"Add":"/// [`RemoteDelta`] contains data about the difference between"},{"Add":"/// the \"actual\" state of the remote ('theirs') and the last version of it"},{"Add":"/// that we cached ('ours'). The dichotomy is the last point at which the two"},{"Add":"/// were the same. `remote_unrecs` is a list of changes which used to be"},{"Add":"/// present in the remote, AND were present in the current channel we're"},{"Add":"/// pulling to or pushing from. The significance of that is that if we knew"},{"Add":"/// about a certain change but did not pull it, the user won't be notified"},{"Add":"/// if it's unrecorded in the remote."},{"Add":"///"},{"Add":"/// If the remote we're pulling from or pushing to is a LocalChannel,"},{"Add":"/// (meaning it's just a different channel of the repo we're already in), then"},{"Add":"/// `ours_ge_dichotomy`, `theirs_ge_dichotomy`, and `remote_unrecs` will be empty"},{"Add":"/// since they have no meaning. If we're pulling from a LocalChannel,"},{"Add":"/// there's no cache to have diverged from, and if we're pushing to a LocalChannel,"},{"Add":"/// we're not going to suddenly be surprised by the presence of unknown changes."},{"Add":"///"},{"Add":"/// This struct will be created by both a push and pull operation since both"},{"Add":"/// need to update the changelist and will at least try to update the local"},{"Add":"/// remote cache. For a push, this later gets turned into [`PushDelta`]."},{"Add":"pub(crate) struct RemoteDelta {"},{"Add":" pub inodes: HashSet>,"},{"Add":" pub to_download: Vec,"},{"Add":" pub remote_ref: Option>,"},{"Add":" pub ours_ge_dichotomy_set: HashSet,"},{"Add":" pub theirs_ge_dichotomy_set: HashSet,"},{"Add":" // Keep the Vec representation around as well so that notification"},{"Add":" // for unknown changes during shows the hashes in order."},{"Add":" pub theirs_ge_dichotomy: Vec<(u64, Hash, Merkle)>,"},{"Add":" pub remote_unrecs: Vec<(u64, Hash)>,"},{"Add":"}"},{"Add":""},{"Add":"impl RemoteDelta> {"},{"Add":" /// Make a [`PushDelta`] from a [`RemoteDelta`]"},{"Add":" /// when the remote is a [`RemoteRepo::LocalChannel`]."},{"Add":" pub(crate) fn to_local_channel_push("},{"Add":" self,"},{"Add":" remote_channel: &str,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" path: &[String],"},{"Add":" channel: &ChannelRef>,"},{"Add":" repo: &Repository,"},{"Add":" ) -> Result>, anyhow::Error> {"},{"Add":" let mut to_upload = Vec::::new();"},{"Add":" let inodes = get_local_inodes(txn, channel, repo, path)?;"},{"Add":""},{"Add":" for x in txn.reverse_log(&*channel.read(), None)? {"},{"Add":" let (_, (h, _)) = x?;"},{"Add":" if let Some(channel) = txn.load_channel(remote_channel)? {"},{"Add":" let channel = channel.read();"},{"Add":" let h_int = txn.get_internal(h)?.unwrap();"},{"Add":" if txn.get_changeset(txn.changes(&channel), h_int)?.is_none() {"},{"Add":" if inodes.is_empty() {"},{"Add":" to_upload.push(h.into())"},{"Add":" } else {"},{"Add":" for p in inodes.iter() {"},{"Add":" if txn.get_touched_files(p, Some(h_int))?.is_some() {"},{"Add":" to_upload.push(h.into());"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" assert!(self.ours_ge_dichotomy_set.is_empty());"},{"Add":" assert!(self.theirs_ge_dichotomy_set.is_empty());"},{"Add":" let d = PushDelta {"},{"Add":" to_upload: to_upload.into_iter().rev().collect(),"},{"Add":" remote_ref: self.remote_ref,"},{"Add":" remote_unrecs: self.remote_unrecs,"},{"Add":" unknown_changes: Vec::new(),"},{"Add":" };"},{"Add":" assert!(d.remote_unrecs.is_empty());"},{"Add":" Ok(d)"},{"Add":" }"},{"Add":""},{"Add":" /// Make a [`PushDelta`] from a [`RemoteDelta`] when the remote"},{"Add":" /// is not a LocalChannel."},{"Add":" pub(crate) fn to_remote_push("},{"Add":" self,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" path: &[String],"},{"Add":" channel: &ChannelRef>,"},{"Add":" repo: &Repository,"},{"Add":" ) -> Result>, anyhow::Error> {"},{"Add":" let mut to_upload = Vec::::new();"},{"Add":" let inodes = get_local_inodes(txn, channel, repo, path)?;"},{"Add":" if let Some(ref remote_ref) = self.remote_ref {"},{"Add":" for x in txn.reverse_log(&*channel.read(), None)? {"},{"Add":" let (_, (h, m)) = x?;"},{"Add":" if txn.remote_has_state(remote_ref, &m)? {"},{"Add":" break;"},{"Add":" }"},{"Add":" let h_int = txn.get_internal(h)?.unwrap();"},{"Add":" let h_deser = Hash::from(h);"},{"Add":" // For elements that are in the uncached remote changes (theirs_ge_dichotomy),"},{"Add":" // don't put those in to_upload since the remote we're pushing to"},{"Add":" // already has those changes."},{"Add":" if !txn.remote_has_change(remote_ref, &h)?"},{"Add":" && !self.theirs_ge_dichotomy_set.contains(&h_deser)"},{"Add":" {"},{"Add":" if inodes.is_empty() {"},{"Add":" to_upload.push(h_deser)"},{"Add":" } else {"},{"Add":" for p in inodes.iter() {"},{"Add":" if txn.get_touched_files(p, Some(h_int))?.is_some() {"},{"Add":" to_upload.push(h_deser);"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" // { h | h \\in theirs_ge_dichotomy /\\ ~(h \\in ours_ge_dichotomy) }"},{"Add":" // The set of their changes >= dichotomy that aren't"},{"Add":" // already known to our set of changes after the dichotomy."},{"Add":" let unknown_changes = self"},{"Add":" .theirs_ge_dichotomy"},{"Add":" .iter()"},{"Add":" .filter_map(|(_, h, _)| {"},{"Add":" if self.ours_ge_dichotomy_set.contains(h) {"},{"Add":" None"},{"Add":" } else {"},{"Add":" Some(*h)"},{"Add":" }"},{"Add":" })"},{"Add":" .collect::>();"},{"Add":""},{"Add":" Ok(PushDelta {"},{"Add":" to_upload: to_upload.into_iter().rev().collect(),"},{"Add":" remote_ref: self.remote_ref,"},{"Add":" remote_unrecs: self.remote_unrecs,"},{"Add":" unknown_changes,"},{"Add":" })"}]}},{"Edit":{"inode":{"change":5,"pos":52474},"path":"pijul/src/remote/mod.rs","line":290,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":55184}],"down_context":[{"change":5,"pos":55184}],"flag":"BLOCK","start":7446,"end":10199,"inode":{"change":5,"pos":52474}}},"contents":[{"Add":"/// Create a [`RemoteDelta`] for a [`RemoteRepo::LocalChannel`]."},{"Add":"/// Since this case doesn't have a local remote cache to worry about,"},{"Add":"/// mainly just calculates the `to_download` list of changes."},{"Add":"pub(crate) fn update_changelist_local_channel("},{"Add":" remote_channel: &str,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" path: &[String],"},{"Add":" current_channel: &ChannelRef>,"},{"Add":" repo: &Repository,"},{"Add":" specific_changes: &[String],"},{"Add":") -> Result>, anyhow::Error> {"},{"Add":" if !specific_changes.is_empty() {"},{"Add":" let to_download: Result, anyhow::Error> = specific_changes"},{"Add":" .iter()"},{"Add":" .map(|h| Ok(txn.hash_from_prefix(h)?.0))"},{"Add":" .collect();"},{"Add":" Ok(RemoteDelta {"},{"Add":" inodes: HashSet::new(),"},{"Add":" to_download: to_download?,"},{"Add":" remote_ref: None,"},{"Add":" ours_ge_dichotomy_set: HashSet::new(),"},{"Add":" theirs_ge_dichotomy: Vec::new(),"},{"Add":" theirs_ge_dichotomy_set: HashSet::new(),"},{"Add":" remote_unrecs: Vec::new(),"},{"Add":" })"},{"Add":" } else {"},{"Add":" let mut inodes = HashSet::new();"},{"Add":" let inodes_ = get_local_inodes(txn, current_channel, repo, path)?;"},{"Add":" let mut to_download = Vec::new();"},{"Add":" inodes.extend(inodes_.iter().map(|x| libpijul::pristine::Position {"},{"Add":" change: txn.get_external(&x.change).unwrap().unwrap().into(),"},{"Add":" pos: x.pos,"},{"Add":" }));"},{"Add":" if let Some(remote_channel) = txn.load_channel(remote_channel)? {"},{"Add":" let remote_channel = remote_channel.read();"},{"Add":" for x in txn.reverse_log(&remote_channel, None)? {"},{"Add":" let (h, m) = x?.1;"},{"Add":" if txn"},{"Add":" .channel_has_state(txn.states(&*current_channel.read()), &m)?"},{"Add":" .is_some()"},{"Add":" {"},{"Add":" break;"},{"Add":" }"},{"Add":" let h_int = txn.get_internal(h)?.unwrap();"},{"Add":" if txn"},{"Add":" .get_changeset(txn.changes(&*current_channel.read()), h_int)?"},{"Add":" .is_none()"},{"Add":" {"},{"Add":" if inodes_.is_empty()"},{"Add":" || inodes_.iter().any(|&inode| {"},{"Add":" txn.get_rev_touched_files(h_int, Some(&inode))"},{"Add":" .unwrap()"},{"Add":" .is_some()"},{"Add":" })"},{"Add":" {"},{"Add":" to_download.push(h.into())"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(RemoteDelta {"},{"Add":" inodes,"},{"Add":" to_download,"},{"Add":" remote_ref: None,"},{"Add":" ours_ge_dichotomy_set: HashSet::new(),"},{"Add":" theirs_ge_dichotomy: Vec::new(),"},{"Add":" theirs_ge_dichotomy_set: HashSet::new(),"},{"Add":" remote_unrecs: Vec::new(),"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":5,"pos":52474},"path":"pijul/src/remote/mod.rs","line":449,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":57522}],"down_context":[{"change":5,"pos":57522}],"flag":"BLOCK","start":10200,"end":14319,"inode":{"change":5,"pos":52474}}},"contents":[{"Add":""},{"Add":" /// Creates a [`RemoteDelta`]."},{"Add":" ///"},{"Add":" /// IF:"},{"Add":" /// the RemoteRepo is a [`RemoteRepo::LocalChannel`], delegate to"},{"Add":" /// the simpler method [`update_changelist_local_channel`], returning the"},{"Add":" /// `to_download` list of changes."},{"Add":" ///"},{"Add":" /// ELSE:"},{"Add":" /// calculate the `to_download` list of changes. Additionally, if there are"},{"Add":" /// no remote unrecords, update the local remote cache. If there are remote unrecords,"},{"Add":" /// calculate and return information about the difference between our cached version"},{"Add":" /// of the remote, and their version of the remote."},{"Add":" pub(crate) async fn update_changelist_pushpull("},{"Add":" &mut self,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" path: &[String],"},{"Add":" current_channel: &ChannelRef>,"},{"Add":" force_cache: Option,"},{"Add":" repo: &Repository,"},{"Add":" specific_changes: &[String],"},{"Add":" ) -> Result>, anyhow::Error> {"},{"Add":" debug!(\"update_changelist\");"},{"Add":" if let RemoteRepo::LocalChannel(c) = self {"},{"Add":" return update_changelist_local_channel("},{"Add":" c,"},{"Add":" txn,"},{"Add":" path,"},{"Add":" current_channel,"},{"Add":" repo,"},{"Add":" specific_changes,"},{"Add":" );"},{"Add":" }"},{"Add":""},{"Add":" let id = self.get_id(txn).await?.unwrap();"},{"Add":" let mut remote_ref = if let Some(name) = self.name() {"},{"Add":" txn.open_or_create_remote(id, name).unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"},{"Add":" let dichotomy_n = self"},{"Add":" .dichotomy_changelist(txn, &remote_ref.lock().remote)"},{"Add":" .await?;"},{"Add":" let ours_ge_dichotomy: Vec<(u64, Hash)> = txn"},{"Add":" .iter_remote(&remote_ref.lock().remote, dichotomy_n)?"},{"Add":" .filter_map(|k| {"},{"Add":" debug!(\"filter_map {:?}\", k);"},{"Add":" match k.unwrap() {"},{"Add":" (k, libpijul::pristine::Pair { a: hash, .. }) => {"},{"Add":" let (k, hash) = (u64::from(*k), Hash::from(*hash));"},{"Add":" if k >= dichotomy_n {"},{"Add":" Some((k, hash))"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" })"},{"Add":" .collect();"},{"Add":" let (inodes, theirs_ge_dichotomy) ="},{"Add":" self.download_changelist_nocache(dichotomy_n, path).await?;"},{"Add":" let ours_ge_dichotomy_set = ours_ge_dichotomy"},{"Add":" .iter()"},{"Add":" .map(|(_, h)| h)"},{"Add":" .copied()"},{"Add":" .collect::>();"},{"Add":" let theirs_ge_dichotomy_set = theirs_ge_dichotomy"},{"Add":" .iter()"},{"Add":" .map(|(_, h, _)| h)"},{"Add":" .copied()"},{"Add":" .collect::>();"},{"Add":""},{"Add":" // remote_unrecs = {x: (u64, Hash) | x \\in ours_ge_dichot /\\ ~(x \\in theirs_ge_dichot) /\\ x \\in current_channel }"},{"Add":" let mut remote_unrecs = Vec::new();"},{"Add":" for (n, hash) in &ours_ge_dichotomy {"},{"Add":" if theirs_ge_dichotomy_set.contains(hash) {"},{"Add":" // If this change is still present in the remote, skip"},{"Add":" continue;"},{"Add":" } else if txn.get_revchanges(¤t_channel, &hash)?.is_none() {"},{"Add":" // If this unrecord wasn't in our current channel, skip"},{"Add":" continue;"},{"Add":" } else {"},{"Add":" remote_unrecs.push((*n, *hash))"},{"Add":" }"},{"Add":" }"},{"Add":" let should_cache = force_cache.unwrap_or_else(|| remote_unrecs.is_empty());"},{"Add":" if should_cache {"},{"Add":" for (k, _) in ours_ge_dichotomy.iter().copied() {"},{"Add":" txn.del_remote(&mut remote_ref, k)?;"},{"Add":" }"},{"Add":" for (n, h, m) in theirs_ge_dichotomy.iter().copied() {"},{"Add":" txn.put_remote(&mut remote_ref, n, (h, m))?;"},{"Add":" }"},{"Add":" }"},{"Add":" let state_cond = |txn: &MutTxn<()>, merkle: &libpijul::pristine::SerializedMerkle| {"},{"Add":" txn.channel_has_state(txn.states(&*current_channel.read()), merkle)"},{"Add":" .map(|x| x.is_some())"},{"Add":" };"},{"Add":" let change_cond = |txn: &MutTxn<()>, hash: &Hash| {"},{"Add":" txn.get_revchanges(¤t_channel, hash)"},{"Add":" .unwrap()"},{"Add":" .is_none()"},{"Add":" };"}]}},{"Edit":{"inode":{"change":5,"pos":52474},"path":"pijul/src/remote/mod.rs","line":553,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":57523}],"down_context":[{"change":5,"pos":1663}],"flag":"BLOCK","start":14320,"end":18472,"inode":{"change":5,"pos":52474}}},"contents":[{"Add":" // IF:"},{"Add":" // The user only wanted to push/pull specific changes"},{"Add":" // ELIF:"},{"Add":" // The user specified no changes and there were no remote unrecords"},{"Add":" // effecting the current channel means we can auto-cache"},{"Add":" // the local remote cache"},{"Add":" // ELSE:"},{"Add":" // The user specified no changes but there were remote unrecords"},{"Add":" // effecting the current channel meaning we can't auto-cache"},{"Add":" // the local remote cache."},{"Add":" if !specific_changes.is_empty() {"},{"Add":" let to_download = specific_changes"},{"Add":" .iter()"},{"Add":" .map(|h| Ok(txn.hash_from_prefix(h)?.0))"},{"Add":" .collect::, anyhow::Error>>();"},{"Add":" Ok(RemoteDelta {"},{"Add":" inodes,"},{"Add":" remote_ref: Some(remote_ref),"},{"Add":" to_download: to_download?,"},{"Add":" ours_ge_dichotomy_set,"},{"Add":" theirs_ge_dichotomy,"},{"Add":" theirs_ge_dichotomy_set,"},{"Add":" remote_unrecs,"},{"Add":" })"},{"Add":" } else if should_cache {"},{"Add":" let mut to_download: Vec = Vec::new();"},{"Add":" for thing in txn.iter_remote(&remote_ref.lock().remote, 0)? {"},{"Add":" let (_, libpijul::pristine::Pair { a: hash, b: merkle }) = thing?;"},{"Add":" if state_cond(txn, &merkle)? {"},{"Add":" break;"},{"Add":" } else if change_cond(txn, &hash.into()) {"},{"Add":" to_download.push(Hash::from(hash));"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(RemoteDelta {"},{"Add":" inodes,"},{"Add":" remote_ref: Some(remote_ref),"},{"Add":" to_download,"},{"Add":" ours_ge_dichotomy_set,"},{"Add":" theirs_ge_dichotomy,"},{"Add":" theirs_ge_dichotomy_set,"},{"Add":" remote_unrecs,"},{"Add":" })"},{"Add":" } else {"},{"Add":" let mut to_download: Vec = Vec::new();"},{"Add":" for thing in txn.iter_remote(&remote_ref.lock().remote, 0)? {"},{"Add":" let (n, libpijul::pristine::Pair { a: hash, b: merkle }) = thing?;"},{"Add":" if u64::from(*n) < dichotomy_n {"},{"Add":" if state_cond(txn, &merkle)? {"},{"Add":" continue;"},{"Add":" } else if change_cond(txn, &hash.into()) {"},{"Add":" to_download.push(Hash::from(hash));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" for (_, hash, merkle) in &theirs_ge_dichotomy {"},{"Add":" if state_cond(txn, &merkle.into())? {"},{"Add":" continue;"},{"Add":" } else if change_cond(txn, &hash) {"},{"Add":" to_download.push(Hash::from(*hash));"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(RemoteDelta {"},{"Add":" inodes,"},{"Add":" remote_ref: Some(remote_ref),"},{"Add":" to_download,"},{"Add":" ours_ge_dichotomy_set,"},{"Add":" theirs_ge_dichotomy,"},{"Add":" theirs_ge_dichotomy_set,"},{"Add":" remote_unrecs,"},{"Add":" })"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" /// Get the list of the remote's changes that come after `from: u64`."},{"Add":" /// Instead of immediately updating the local cache of the remote, return"},{"Add":" /// the change info without changing the cache."},{"Add":" pub async fn download_changelist_nocache("},{"Add":" &mut self,"},{"Add":" from: u64,"},{"Add":" paths: &[String],"},{"Add":" ) -> Result<(HashSet>, Vec<(u64, Hash, Merkle)>), anyhow::Error> {"},{"Add":" let mut v = Vec::new();"},{"Add":" let f = |v: &mut Vec<(u64, Hash, Merkle)>, n, h, m| {"},{"Add":" debug!(\"no cache: {:?}\", h);"},{"Add":" Ok(v.push((n, h, m)))"},{"Add":" };"},{"Add":" let r = match *self {"},{"Add":" RemoteRepo::Local(ref mut l) => l.download_changelist(f, &mut v, from, paths)?,"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.download_changelist(f, &mut v, from, paths).await?,"},{"Add":" RemoteRepo::Http(ref h) => h.download_changelist(f, &mut v, from, paths).await?,"},{"Add":" RemoteRepo::LocalChannel(_) => HashSet::new(),"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" };"},{"Add":" Ok((r, v))"},{"Add":" }"},{"Add":""},{"Add":" /// Uses a binary search to find the integer identifier of the last point"},{"Add":" /// at which our locally cached version of the remote was the same as the 'actual'"},{"Add":" /// state of the remote."}]}},{"Edit":{"inode":{"change":5,"pos":52474},"path":"pijul/src/remote/mod.rs","line":799,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7},"to":{"change":3,"start":7,"end":757},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":757},"to":{"change":5,"start":65140,"end":65147},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":65140},"to":{"change":5,"start":65140,"end":65147},"introduced_by":5}],"inode":{"change":5,"pos":52474}}},"contents":[{"Del":" pub async fn download_changelist_nocache(\n &mut self,\n from: u64,\n paths: &[String],\n v: &mut Vec,\n ) -> Result>, anyhow::Error> {\n let f = |v: &mut Vec, _n, h, _m| {\n debug!(\"no cache: {:?}\", h);\n Ok(v.push(h))\n };\n let r = match *self {\n RemoteRepo::Local(ref mut l) => l.download_changelist(f, v, from, paths)?,\n RemoteRepo::Ssh(ref mut s) => s.download_changelist(f, v, from, paths).await?,\n RemoteRepo::Http(ref h) => h.download_changelist(f, v, from, paths).await?,\n RemoteRepo::LocalChannel(_) => HashSet::new(),\n RemoteRepo::None => unreachable!(),\n };\n Ok(r)\n"},{"Del":" }\n\n"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":111707}],"down_context":[{"change":5,"pos":12857}],"flag":"BLOCK","start":18473,"end":18516,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":"use libpijul::pristine::sanakirja::MutTxn;"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":16,"atom":{"NewVertex":{"up_context":[{"change":39,"pos":4805}],"down_context":[{"change":5,"pos":1761}],"flag":"BLOCK","start":18517,"end":18574,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":"use crate::remote::{PushDelta, RemoteDelta, RemoteRepo};"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":78,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":113241}],"down_context":[{"change":40,"pos":1194}],"flag":"BLOCK","start":18575,"end":18777,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":" /// Force an update of the local remote cache. May effect some"},{"Add":" /// reporting of unrecords/concurrent changes in the remote."},{"Add":" #[clap(long = \"force-cache\", short = 'f')]"},{"Add":" force_cache: bool,"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":109,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":113745}],"down_context":[{"change":40,"pos":1560}],"flag":"BLOCK","start":18778,"end":18980,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":" /// Force an update of the local remote cache. May effect some"},{"Add":" /// reporting of unrecords/concurrent changes in the remote."},{"Add":" #[clap(long = \"force-cache\", short = 'f')]"},{"Add":" force_cache: bool,"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":137,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":114453}],"down_context":[{"change":5,"pos":114453}],"flag":"BLOCK","start":18981,"end":20067,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":" /// Gets the `to_upload` vector while trying to auto-update"},{"Add":" /// the local cache if possible. Also calculates whether the remote"},{"Add":" /// has any changes we don't know about."},{"Add":" async fn to_upload("},{"Add":" &self,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" channel: &mut ChannelRef>,"},{"Add":" repo: &Repository,"},{"Add":" remote: &mut RemoteRepo,"},{"Add":" ) -> Result>, anyhow::Error> {"},{"Add":" let remote_delta = remote"},{"Add":" .update_changelist_pushpull("},{"Add":" txn,"},{"Add":" &self.path,"},{"Add":" channel,"},{"Add":" Some(self.force_cache),"},{"Add":" repo,"},{"Add":" self.changes.as_slice(),"},{"Add":" )"},{"Add":" .await?;"},{"Add":" if let RemoteRepo::LocalChannel(ref remote_channel) = remote {"},{"Add":" remote_delta.to_local_channel_push("},{"Add":" remote_channel,"},{"Add":" txn,"},{"Add":" self.path.as_slice(),"},{"Add":" channel,"},{"Add":" repo,"},{"Add":" )"},{"Add":" } else {"},{"Add":" remote_delta.to_remote_push(txn, self.path.as_slice(), channel, repo)"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":172,"ins":{"up_context":[{"change":5,"pos":1981}],"down_context":[{"change":5,"pos":114570}],"flag":"BLOCK","start":20068,"end":20135,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1981},"to":{"change":5,"start":15226,"end":15285},"introduced_by":5}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":" let repo = Repository::find_root(self.repo_path.clone())?;"}],"del_contents":[{"Del":" let repo = Repository::find_root(self.repo_path)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":215,"ins":{"up_context":[{"change":5,"pos":115558}],"down_context":[{"change":4,"pos":7019}],"flag":"BLOCK","start":20136,"end":20436,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":115558},"to":{"change":4,"start":6921,"end":7019},"introduced_by":4}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":""},{"Add":" let mut channel = txn.write().open_or_create_channel(&channel_name)?;"},{"Add":""},{"Add":" let PushDelta {"},{"Add":" remote_ref,"},{"Add":" to_upload,"},{"Add":" remote_unrecs,"},{"Add":" unknown_changes,"},{"Add":" } = self"},{"Add":" .to_upload(&mut *txn.write(), &mut channel, &repo, &mut remote)"}],"del_contents":[{"Del":" let remote_changes = remote\n .update_changelist(&mut *txn.write(), &self.path)\n"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":226,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7040},"to":{"change":4,"start":7040,"end":7114},"introduced_by":4}],"inode":{"change":5,"pos":111631}}},"contents":[{"Del":" let channel = txn.write().open_or_create_channel(&channel_name)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":227,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":115889},"to":{"change":5,"start":7039,"end":7118},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7118},"to":{"change":4,"start":7115,"end":7245},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":7207},"to":{"change":5,"start":116032,"end":116059},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":4,"pos":7245},"to":{"change":5,"start":116032,"end":116059},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116032},"to":{"change":5,"start":116032,"end":116059},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116059},"to":{"change":5,"start":7208,"end":7260},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":752},"to":{"change":5,"start":116148,"end":116162},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":7260},"to":{"change":5,"start":116148,"end":116162},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116148},"to":{"change":5,"start":116148,"end":116162},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116162},"to":{"change":5,"start":7261,"end":7290},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7290},"to":{"change":5,"start":12957,"end":12983},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":12983},"to":{"change":4,"start":7246,"end":7340},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":7340},"to":{"change":5,"start":13071,"end":13128},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15260},"to":{"change":5,"start":13071,"end":13128},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13071},"to":{"change":5,"start":13071,"end":13128},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":13128},"to":{"change":5,"start":7445,"end":7455},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7445},"to":{"change":5,"start":7445,"end":7455},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":7455},"to":{"change":5,"start":116227,"end":116228},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116227},"to":{"change":5,"start":116227,"end":116228},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116228},"to":{"change":5,"start":10462,"end":10513},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10513},"to":{"change":4,"start":7341,"end":7657},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":7657},"to":{"change":5,"start":116707,"end":116729},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116707},"to":{"change":5,"start":116707,"end":116729},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15374},"to":{"change":5,"start":13573,"end":13636},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5258},"to":{"change":5,"start":13573,"end":13636},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13636},"to":{"change":4,"start":7658,"end":7728},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":428},"to":{"change":5,"start":7889,"end":7935},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":709},"to":{"change":5,"start":7889,"end":7935},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":4,"pos":7728},"to":{"change":5,"start":7889,"end":7935},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":13721},"to":{"change":5,"start":7889,"end":7935},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5404},"to":{"change":5,"start":7889,"end":7935},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7935},"to":{"change":5,"start":10836,"end":10889},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10889},"to":{"change":5,"start":7981,"end":8066},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7981},"to":{"change":5,"start":7981,"end":8066},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8066},"to":{"change":5,"start":10890,"end":11038},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11038},"to":{"change":5,"start":8207,"end":8284},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8207},"to":{"change":5,"start":8207,"end":8284},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8284},"to":{"change":5,"start":5588,"end":5618},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5588},"to":{"change":5,"start":5588,"end":5618},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5697},"to":{"change":5,"start":5697,"end":5745},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5745},"to":{"change":4,"start":7729,"end":8671},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5745},"to":{"change":5,"start":116792,"end":116824},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":4,"pos":8671},"to":{"change":5,"start":116792,"end":116824},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116792},"to":{"change":5,"start":116792,"end":116824},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116895},"to":{"change":5,"start":116895,"end":116905},"introduced_by":5}],"inode":{"change":5,"pos":111631}}},"contents":[{"Del":" let mut paths = HashSet::new();\n for path in self.path.iter() {\n"},{"Del":" let (p, ambiguous) = txn\n .read()\n .follow_oldest_path(&repo.changes, &channel, path)?;\n"},{"Del":" if ambiguous {\n"},{"Del":" bail!(\"Ambiguous path: {:?}\", path)\n"},{"Del":" }\n"},{"Del":" paths.insert(p);\n"},{"Del":" paths.extend(\n"},{"Del":" libpijul::fs::iter_graph_descendants(&*txn.read(), &channel.read().graph, p)?\n"},{"Del":" .map(|x| x.unwrap()),\n );\n"},{"Del":" }\n"},{"Del":"\n"},{"Del":" let mut to_upload: Vec = Vec::new();\n"},{"Del":" {\n let txn = txn.read();\n for x in txn.reverse_log(&*channel.read(), None)? {\n let (_, (h, m)) = x?;\n if let Some((_, ref remote_changes)) = remote_changes {\n if txn.remote_has_state(remote_changes, &m)? {\n break;\n"},{"Del":" }\n"},{"Del":" let h_int = txn.get_internal(h)?.unwrap();\n"},{"Del":" if !txn.remote_has_change(&remote_changes, &h)? {\n"},{"Del":" if paths.is_empty() {\n"},{"Del":" to_upload.push(h.into())\n"},{"Del":" } else {\n for p in paths.iter() {\n"},{"Del":" if txn.get_touched_files(p, Some(h_int))?.is_some() {\n to_upload.push(h.into());\n"},{"Del":" break;\n }\n"},{"Del":" }\n"},{"Del":" }\n }\n"},{"Del":" } else if let crate::remote::RemoteRepo::LocalChannel(ref remote_channel) = remote {\n if let Some(channel) = txn.load_channel(remote_channel)? {\n let channel = channel.read();\n let h_int = txn.get_internal(h)?.unwrap();\n if txn.get_changeset(txn.changes(&channel), h_int)?.is_none() {\n if paths.is_empty() {\n to_upload.push(h.into())\n } else {\n for p in paths.iter() {\n if txn.get_touched_files(p, Some(h_int))?.is_some() {\n to_upload.push(h.into());\n break;\n }\n }\n }\n }\n }\n"},{"Del":" }\n }\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":234,"ins":{"up_context":[{"change":5,"pos":72}],"down_context":[{"change":5,"pos":72}],"flag":"BLOCK","start":20437,"end":20564,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":72},"to":{"change":2,"start":0,"end":29},"introduced_by":2}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":""},{"Add":" notify_remote_unrecords(&repo, remote_unrecs.as_slice());"},{"Add":" notify_unknown_changes(unknown_changes.as_slice());"}],"del_contents":[{"Del":" to_upload.reverse();\n"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":267,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":77},"to":{"change":5,"start":8346,"end":8408},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8408},"to":{"change":4,"start":8707,"end":8741},"introduced_by":4}],"inode":{"change":5,"pos":111631}}},"contents":[{"Del":" let remote_changes = remote_changes.map(|x| x.1);\n"},{"Del":" let txn = txn.read();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":269,"ins":{"up_context":[{"change":5,"pos":158}],"down_context":[{"change":5,"pos":232}],"flag":"BLOCK","start":20565,"end":20666,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":158},"to":{"change":4,"start":8742,"end":8840},"introduced_by":4}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":" let comp = complete_deps(&*txn.read(), &remote_ref, &repo.changes, &to_upload, &d)?;"}],"del_contents":[{"Del":" let comp = complete_deps(&*txn, &remote_changes, &repo.changes, &to_upload, &d)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":300,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":117527}],"down_context":[{"change":5,"pos":117527}],"flag":"BLOCK","start":20667,"end":21786,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":" /// Gets the `to_download` vec and calculates any remote unrecords."},{"Add":" /// If the local remote cache can be auto-updated, it will be."},{"Add":" async fn to_download("},{"Add":" &self,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" channel: &mut ChannelRef>,"},{"Add":" repo: &mut Repository,"},{"Add":" remote: &mut RemoteRepo,"},{"Add":" ) -> Result>, anyhow::Error> {"},{"Add":" let force_cache = if self.force_cache {"},{"Add":" Some(self.force_cache)"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":" let delta = remote"},{"Add":" .update_changelist_pushpull("},{"Add":" txn,"},{"Add":" &self.path,"},{"Add":" channel,"},{"Add":" force_cache,"},{"Add":" repo,"},{"Add":" self.changes.as_slice(),"},{"Add":" )"},{"Add":" .await?;"},{"Add":" let to_download = remote"},{"Add":" .pull("},{"Add":" repo,"},{"Add":" txn,"},{"Add":" channel,"},{"Add":" delta.to_download.as_slice(),"},{"Add":" &delta.inodes,"},{"Add":" false,"},{"Add":" )"},{"Add":" .await?;"},{"Add":""},{"Add":" Ok(RemoteDelta {"},{"Add":" to_download,"},{"Add":" ..delta"},{"Add":" })"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":342,"ins":{"up_context":[{"change":5,"pos":117585}],"down_context":[{"change":4,"pos":9020}],"flag":"BLOCK","start":21787,"end":21858,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":117585},"to":{"change":5,"start":15309,"end":15372},"introduced_by":5}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":" let mut repo = Repository::find_root(self.repo_path.clone())?;"}],"del_contents":[{"Del":" let mut repo = Repository::find_root(self.repo_path)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":380,"ins":{"up_context":[{"change":5,"pos":118434}],"down_context":[{"change":4,"pos":9431}],"flag":"BLOCK","start":21859,"end":22099,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":118434},"to":{"change":5,"start":8446,"end":8542},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8542},"to":{"change":4,"start":9333,"end":9431},"introduced_by":4}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":" let RemoteDelta {"},{"Add":" inodes,"},{"Add":" remote_ref,"},{"Add":" mut to_download,"},{"Add":" remote_unrecs,"},{"Add":" .."},{"Add":" } = self"},{"Add":" .to_download(&mut *txn.write(), &mut channel, &mut repo, &mut remote)"}],"del_contents":[{"Del":" let mut inodes: HashSet> = HashSet::new();\n"},{"Del":" let remote_changes = remote\n .update_changelist(&mut *txn.write(), &self.path)\n"}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":389,"ins":{"up_context":[{"change":4,"pos":9452}],"down_context":[{"change":5,"pos":15913}],"flag":"BLOCK","start":22100,"end":22101,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":9452},"to":{"change":5,"start":8542,"end":8601},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15480},"to":{"change":5,"start":8542,"end":8601},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8542},"to":{"change":5,"start":8542,"end":8601},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2129},"to":{"change":5,"start":118721,"end":118760},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8689},"to":{"change":5,"start":118721,"end":118760},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":118721},"to":{"change":5,"start":118721,"end":118760},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":118760},"to":{"change":5,"start":11097,"end":11154},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":11154},"to":{"change":5,"start":15481,"end":15560},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15560},"to":{"change":5,"start":8760,"end":8812},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8760},"to":{"change":5,"start":8760,"end":8812},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8812},"to":{"change":4,"start":9453,"end":9569},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9569},"to":{"change":5,"start":11155,"end":11199},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15454},"to":{"change":5,"start":11155,"end":11199},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13890},"to":{"change":5,"start":11155,"end":11199},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11199},"to":{"change":5,"start":0,"end":27},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":13929},"to":{"change":5,"start":0,"end":27},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":27},"to":{"change":4,"start":9570,"end":9650},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9650},"to":{"change":5,"start":105,"end":162},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11281},"to":{"change":5,"start":105,"end":162},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15536},"to":{"change":5,"start":105,"end":162},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":105},"to":{"change":5,"start":105,"end":162},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":162},"to":{"change":5,"start":6416,"end":6447},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2918},"to":{"change":5,"start":6416,"end":6447},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":13990},"to":{"change":5,"start":6416,"end":6447},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6416},"to":{"change":5,"start":6416,"end":6447},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6447},"to":{"change":5,"start":11282,"end":11420},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11420},"to":{"change":5,"start":6565,"end":6702},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6565},"to":{"change":5,"start":6565,"end":6702},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6702},"to":{"change":5,"start":8813,"end":8863},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8863},"to":{"change":4,"start":9651,"end":9689},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9689},"to":{"change":5,"start":8863,"end":9007},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8863},"to":{"change":5,"start":8863,"end":9007},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9007},"to":{"change":5,"start":6861,"end":6896},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6861},"to":{"change":5,"start":6861,"end":6896},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6896},"to":{"change":5,"start":9008,"end":9068},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":836},"to":{"change":5,"start":6993,"end":7015},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9068},"to":{"change":5,"start":6993,"end":7015},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6993},"to":{"change":5,"start":6993,"end":7015},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7015},"to":{"change":5,"start":9069,"end":9108},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9108},"to":{"change":5,"start":14067,"end":14103},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14103},"to":{"change":4,"start":9690,"end":9785},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9785},"to":{"change":5,"start":14199,"end":14272},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15632},"to":{"change":5,"start":14199,"end":14272},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14199},"to":{"change":5,"start":14199,"end":14272},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14272},"to":{"change":5,"start":9305,"end":9407},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9305},"to":{"change":5,"start":9305,"end":9407},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9407},"to":{"change":5,"start":11421,"end":11503},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11503},"to":{"change":5,"start":9472,"end":9525},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14347},"to":{"change":5,"start":9472,"end":9525},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9472},"to":{"change":5,"start":9472,"end":9525},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9525},"to":{"change":5,"start":14348,"end":14430},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14430},"to":{"change":4,"start":9786,"end":9850},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9850},"to":{"change":5,"start":14431,"end":14545},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15698},"to":{"change":5,"start":14431,"end":14545},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7259},"to":{"change":5,"start":14431,"end":14545},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14545},"to":{"change":5,"start":163,"end":194},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":194},"to":{"change":4,"start":9851,"end":9933},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9933},"to":{"change":5,"start":276,"end":341},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11587},"to":{"change":5,"start":276,"end":341},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15782},"to":{"change":5,"start":276,"end":341},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":276},"to":{"change":5,"start":276,"end":341},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":341},"to":{"change":5,"start":7403,"end":7464},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":3003},"to":{"change":5,"start":7403,"end":7464},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14610},"to":{"change":5,"start":7403,"end":7464},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7403},"to":{"change":5,"start":7403,"end":7464},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7464},"to":{"change":5,"start":14611,"end":14678},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14678},"to":{"change":5,"start":7530,"end":7561},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7530},"to":{"change":5,"start":7530,"end":7561},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7561},"to":{"change":4,"start":9934,"end":10016},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":512},"to":{"change":5,"start":7644,"end":7709},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":794},"to":{"change":5,"start":7644,"end":7709},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":4,"pos":10016},"to":{"change":5,"start":7644,"end":7709},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14763},"to":{"change":5,"start":7644,"end":7709},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15866},"to":{"change":5,"start":7644,"end":7709},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7644},"to":{"change":5,"start":7644,"end":7709},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7709},"to":{"change":5,"start":9526,"end":9641},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9641},"to":{"change":5,"start":11588,"end":11671},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11671},"to":{"change":5,"start":14846,"end":14947},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14846},"to":{"change":5,"start":14846,"end":14947},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":14947},"to":{"change":5,"start":9733,"end":9798},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9733},"to":{"change":5,"start":9733,"end":9798},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9798},"to":{"change":5,"start":11672,"end":11731},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11731},"to":{"change":5,"start":8030,"end":8108},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8030},"to":{"change":5,"start":8030,"end":8108},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8108},"to":{"change":5,"start":119084,"end":119102},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119084},"to":{"change":5,"start":119084,"end":119102},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119102},"to":{"change":3,"start":758,"end":921},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":921},"to":{"change":5,"start":119102,"end":119116},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119102},"to":{"change":5,"start":119102,"end":119116},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119151},"to":{"change":5,"start":119151,"end":119192},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119192},"to":{"change":4,"start":10017,"end":10051},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":10051},"to":{"change":5,"start":2508,"end":2577},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119192},"to":{"change":5,"start":2508,"end":2577},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2577},"to":{"change":5,"start":119271,"end":119431},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119271},"to":{"change":5,"start":119271,"end":119431},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":119431},"to":{"change":5,"start":9799,"end":9828},"introduced_by":5}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" let mut to_download = if self.changes.is_empty() {\n"},{"Del":" debug!(\"changelist done\");\n"},{"Del":" let mut to_download: Vec = Vec::new();\n"},{"Del":" if let Some((inodes_, remote_changes)) = remote_changes.as_ref() {\n"},{"Del":" inodes.extend(inodes_.into_iter());\n"},{"Del":" let txn = txn.read();\n for x in txn.iter_remote(&remote_changes.lock().remote, 0)? {\n"},{"Del":" let p = x?.1; // (h, m)\n"},{"Del":" if txn\n"},{"Del":" .channel_has_state(txn.states(&*channel.read()), &p.b)?\n"},{"Del":" .is_some()\n {\n"},{"Del":" break;\n"},{"Del":" } else if txn.get_revchanges(&channel, &p.a.into())?.is_none() {\n to_download.push(p.a.into())\n"},{"Del":" }\n }\n } else if let crate::remote::RemoteRepo::LocalChannel(ref remote_channel) = remote {\n"},{"Del":" let mut inodes_ = HashSet::new();\n"},{"Del":" let txn = txn.read();\n"},{"Del":" for path in self.path.iter() {\n let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, path)?;\n"},{"Del":" if ambiguous {\n"},{"Del":" bail!(\"Ambiguous path: {:?}\", path)\n"},{"Del":" }\n"},{"Del":" inodes_.insert(p);\n"},{"Del":" inodes_.extend(\n"},{"Del":" libpijul::fs::iter_graph_descendants(&*txn, &channel.read().graph, p)?\n"},{"Del":" .map(|x| x.unwrap()),\n );\n"},{"Del":" }\n inodes.extend(inodes_.iter().map(|x| libpijul::pristine::Position {\n"},{"Del":" change: txn.get_external(&x.change).unwrap().unwrap().into(),\n"},{"Del":" pos: x.pos,\n }));\n"},{"Del":" if let Some(remote_channel) = txn.load_channel(remote_channel)? {\n"},{"Del":" let remote_channel = remote_channel.read();\n"},{"Del":" for x in txn.reverse_log(&remote_channel, None)? {\n let (h, m) = x?.1;\n"},{"Del":" if txn\n"},{"Del":" .channel_has_state(txn.states(&*channel.read()), &m)?\n"},{"Del":" .is_some()\n {\n"},{"Del":" break;\n }\n"},{"Del":" let h_int = txn.get_internal(h)?.unwrap();\n"},{"Del":" if txn\n"},{"Del":" .get_changeset(txn.changes(&*channel.read()), h_int)?\n"},{"Del":" .is_none()\n {\n"},{"Del":" if inodes_.is_empty()\n || inodes_.iter().any(|&inode| {\n"},{"Del":" txn.get_rev_touched_files(h_int, Some(&inode))\n"},{"Del":" .unwrap()\n .is_some()\n"},{"Del":" })\n {\n"},{"Del":" to_download.push(h.into())\n"},{"Del":" }\n }\n }\n"},{"Del":" }\n"},{"Del":" } else {\n inodes = remote\n .download_changelist_nocache(0, &self.path, &mut to_download)\n .await?\n"},{"Del":" }\n"},{"Del":" to_download\n } else {\n"},{"Del":" let txn = txn.read();\n"},{"Del":" let r: Result, anyhow::Error> = self\n"},{"Del":" .changes\n .iter()\n .map(|h| Ok(txn.hash_from_prefix(h)?.0))\n .collect();\n r?\n };\n"},{"Del":" debug!(\"recording\");\n"}]}},{"Replacement":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":391,"ins":{"up_context":[{"change":5,"pos":15987}],"down_context":[{"change":5,"pos":2585}],"flag":"BLOCK","start":22102,"end":22145,"inode":{"change":5,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":16142},"to":{"change":5,"start":0,"end":37},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9899},"to":{"change":5,"start":0,"end":37},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":37},"to":{"change":5,"start":9932,"end":9951},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9932},"to":{"change":5,"start":9932,"end":9951},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15614},"to":{"change":5,"start":9951,"end":9978},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9951},"to":{"change":5,"start":9951,"end":9978},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9978},"to":{"change":4,"start":10052,"end":10087},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":10087},"to":{"change":5,"start":10004,"end":10154},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10004},"to":{"change":5,"start":10004,"end":10154},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":10154},"to":{"change":5,"start":2534,"end":2585},"introduced_by":5}],"inode":{"change":5,"pos":111631}},"ins_contents":[{"Add":""},{"Add":" if let Some(ref r) = remote_ref {"}],"del_contents":[{"Del":" let mut to_download = remote\n"},{"Del":" .pull(\n"},{"Del":" &mut repo,\n"},{"Del":" &mut *txn.write(),\n"},{"Del":" &mut channel,\n &mut to_download,\n &inodes,\n self.all,\n )\n .await?;\n"},{"Del":" if let Some((_, ref r)) = remote_changes {\n"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":395,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":2654}],"down_context":[{"change":5,"pos":10154}],"flag":"BLOCK","start":22146,"end":22213,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":""},{"Add":" notify_remote_unrecords(&repo, remote_unrecs.as_slice());"}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":418,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":808}],"down_context":[{"change":5,"pos":120336}],"flag":"BLOCK","start":22214,"end":22307,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" {"},{"Add":" // Now that .pull is always given `false` for `do_apply`..."}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":438,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":120589}],"down_context":[{"change":5,"pos":120589}],"flag":"BLOCK","start":22308,"end":22309,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":5,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":597,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":123266}],"down_context":[],"flag":"BLOCK","start":22310,"end":24311,"inode":{"change":5,"pos":111631}}},"contents":[{"Add":""},{"Add":"fn notify_remote_unrecords(repo: &Repository, remote_unrecs: &[(u64, Hash)]) {"},{"Add":" use std::fmt::Write;"},{"Add":" if !remote_unrecs.is_empty() {"},{"Add":" let mut s = format!("},{"Add":" \"# The following changes have been unrecorded in the remote.\\n\\"},{"Add":" # This buffer is only being used to inform you of the remote change;\\n\\"},{"Add":" # your push will continue when it is closed.\\n\""},{"Add":" );"},{"Add":" for (_, hash) in remote_unrecs {"},{"Add":" let header = &repo.changes.get_change(hash).unwrap().header;"},{"Add":" s.push_str(\"#\\n\");"},{"Add":" writeln!(&mut s, \"# {}\", header.message).expect(\"Infallible write to String\");"},{"Add":" writeln!(&mut s, \"# {}\", header.timestamp).expect(\"Infallible write to String\");"},{"Add":" writeln!(&mut s, \"# {}\", hash.to_base32()).expect(\"Infallible write to String\");"},{"Add":" }"},{"Add":" if let Err(e) = edit::edit(s.as_str()) {"},{"Add":" log::error!("},{"Add":" \"Notification of remote unrecords experienced an error: {}\","},{"Add":" e"},{"Add":" );"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn notify_unknown_changes(unknown_changes: &[Hash]) {"},{"Add":" use std::fmt::Write;"},{"Add":" if unknown_changes.is_empty() {"},{"Add":" return;"},{"Add":" } else {"},{"Add":" let mut s = format!("},{"Add":" \"# The following changes are new in the remote\\n# (and are not yet known to your local copy):\\n#\\n\""},{"Add":" );"},{"Add":" let rest_len = unknown_changes.len().saturating_sub(5);"},{"Add":" for hash in unknown_changes.iter().take(5) {"},{"Add":" writeln!(&mut s, \"# {}\", hash.to_base32()).expect(\"Infallible write to String\");"},{"Add":" }"},{"Add":" if rest_len > 0 {"},{"Add":" let plural = if rest_len == 1 { \"\" } else { \"s\" };"},{"Add":" writeln!(&mut s, \"# ... plus {} more change{}\", rest_len, plural)"},{"Add":" .expect(\"Infallible write to String\");"},{"Add":" }"},{"Add":" if let Err(e) = edit::edit(s.as_str()) {"},{"Add":" log::error!("},{"Add":" \"Notification of unknown changes experienced an error: {}\","},{"Add":" e"},{"Add":" );"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}}],"owner":"irevoire","repo":"pijul","token":"X+kwTsN8hYE4ry9yFTzF2zrqwIqJcj3ZKUARqlMs41U=","login":null}

…

Dependencies

Change contents