{"header":{"message":"Fixing SSH asynchronicity issues","description":null,"timestamp":"2020-11-23T17:59:35.044142217Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","authors":[],"deps":{"hashes":[["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["AA",null],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["RR65HCKOJU45UCNU5X3XM5HSIRHVUZU4IO4HEBQYHS22HYIIWITQC","Thrussh versions"],["NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","New published versions"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"],["3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","Version updates"],["Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","Fixing Windows compilation"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."]],"deps":["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","RR65HCKOJU45UCNU5X3XM5HSIRHVUZU4IO4HEBQYHS22HYIIWITQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Q7CAYX5N2GFOGMZL3VXVWORMAPWEOECXE22BLXK7Q4WEPS4CE2SAC","NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC"]},"hunks":[{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":25699}],"down_context":[{"change":6,"pos":25699}],"flag":"","start":0,"end":19,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":"use std::pin::Pin;"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":14,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":25788}],"down_context":[{"change":6,"pos":25788}],"flag":"","start":20,"end":44,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":"use tokio::sync::Mutex;"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":28,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26002}],"down_context":[{"change":6,"pos":26002}],"flag":"","start":45,"end":75,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" state: Arc>,"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":88,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":27527}],"down_context":[{"change":6,"pos":27527}],"flag":"","start":76,"end":131,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" let state = Arc::new(Mutex::new(State::None));"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":93,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":27683}],"down_context":[{"change":6,"pos":27683}],"flag":"","start":132,"end":166,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" state: state.clone(),"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":126,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28790}],"down_context":[{"change":6,"pos":28790}],"flag":"","start":167,"end":186,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" state,"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":230,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32378}],"down_context":[{"change":6,"pos":32378}],"flag":"","start":187,"end":915,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" state: Arc>,"},{"Add":"}"},{"Add":""},{"Add":"enum State {"},{"Add":" None,"},{"Add":" State {"},{"Add":" sender: Option>>,"},{"Add":" },"},{"Add":" Changes {"},{"Add":" sender: Option>,"},{"Add":" remaining_len: usize,"},{"Add":" file: std::fs::File,"},{"Add":" path: PathBuf,"},{"Add":" hashes: Vec,"},{"Add":" current: usize,"},{"Add":" },"},{"Add":" Changelist {"},{"Add":" sender: tokio::sync::mpsc::Sender>,"},{"Add":" },"},{"Add":" Channel {"},{"Add":" sender: tokio::sync::mpsc::Sender>,"},{"Add":" },"},{"Add":" Archive {"},{"Add":" sender: Option>,"},{"Add":" len: u64,"},{"Add":" conflicts: u64,"},{"Add":" len_n: u64,"},{"Add":" w: Box,"},{"Add":" },"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":263,"ins":{"up_context":[{"change":6,"pos":32510}],"down_context":[{"change":6,"pos":32596}],"flag":"","start":916,"end":1138,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32510},"to":{"change":6,"start":32510,"end":32596},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" type FutureUnit = Pin<"},{"Add":" Box> + Send>,"},{"Add":" >;"},{"Add":" // type FutureUnit = futures::future::Ready>;"},{"Add":""}],"del_contents":[{"Del":" type FutureUnit = futures::future::Ready>;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":272,"ins":{"up_context":[{"change":6,"pos":32768}],"down_context":[{"change":6,"pos":32820}],"flag":"","start":1139,"end":1247,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32768},"to":{"change":6,"start":32768,"end":32820},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" // futures::future::ready(Ok((self, session)))"},{"Add":" Box::pin(async move { Ok((self, session)) })"}],"del_contents":[{"Del":" futures::future::ready(Ok((self, session)))\n"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":314,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34230}],"down_context":[{"change":6,"pos":34230}],"flag":"","start":1248,"end":7759,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" fn data("},{"Add":" self,"},{"Add":" channel: thrussh::ChannelId,"},{"Add":" data: &[u8],"},{"Add":" session: thrussh::client::Session,"},{"Add":" ) -> Self::FutureUnit {"},{"Add":" debug!(\"data {:?} {:?}\", channel, data.len());"},{"Add":" let data = data.to_vec();"},{"Add":" Box::pin(async move {"},{"Add":" match *self.state.lock().await {"},{"Add":" State::State { ref mut sender } => {"},{"Add":" debug!(\"state: State\");"},{"Add":" if let Some(sender) = sender.take() {"},{"Add":" // If we can't parse `data` (for example if the"},{"Add":" // remote returns the standard \"-\\n\"), this"},{"Add":" // returns None."},{"Add":" let mut s = std::str::from_utf8(&data).unwrap().split(' ');"},{"Add":" debug!(\"s = {:?}\", s);"},{"Add":" if let (Some(n), Some(m)) = (s.next(), s.next()) {"},{"Add":" let n = n.parse().unwrap();"},{"Add":" sender"},{"Add":" .send(Some((n, Merkle::from_base32(m.trim().as_bytes()).unwrap())))"},{"Add":" .unwrap_or(());"},{"Add":" } else {"},{"Add":" sender.send(None).unwrap_or(());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" State::Changes {"},{"Add":" ref mut sender,"},{"Add":" ref mut remaining_len,"},{"Add":" ref mut file,"},{"Add":" ref mut path,"},{"Add":" ref hashes,"},{"Add":" ref mut current,"},{"Add":" } => {"},{"Add":" debug!(\"state changes\");"},{"Add":" let mut p = 0;"},{"Add":" while p < data.len() {"},{"Add":" if *remaining_len == 0 {"},{"Add":" *remaining_len = (&data[p..]).read_u64::().unwrap() as usize;"},{"Add":" p += 8;"},{"Add":" debug!(\"remaining_len = {:?}\", remaining_len);"},{"Add":" }"},{"Add":" if data.len() >= p + *remaining_len {"},{"Add":" file.write_all(&data[p..p + *remaining_len])?;"},{"Add":" // We have enough data to write the"},{"Add":" // file, write it and move to the next"},{"Add":" // file."},{"Add":" p += *remaining_len;"},{"Add":" *remaining_len = 0;"},{"Add":" file.flush()?;"},{"Add":" let mut final_path = path.clone();"},{"Add":" final_path.set_extension(\"change\");"},{"Add":" debug!(\"moving {:?} to {:?}\", path, final_path);"},{"Add":" std::fs::rename(&path, &final_path)?;"},{"Add":" debug!(\"sending\");"},{"Add":" if let Some(ref mut sender) = sender {"},{"Add":" sender.send(hashes[*current].clone()).await.unwrap();"},{"Add":" }"},{"Add":" debug!(\"sent\");"},{"Add":" *current += 1;"},{"Add":" if *current < hashes.len() {"},{"Add":" // If we're still waiting for"},{"Add":" // another change."},{"Add":" libpijul::changestore::filesystem::pop_filename(path);"},{"Add":" libpijul::changestore::filesystem::push_filename("},{"Add":" path,"},{"Add":" &hashes[*current],"},{"Add":" );"},{"Add":" std::fs::create_dir_all(&path.parent().unwrap())?;"},{"Add":" path.set_extension(\"\");"},{"Add":" debug!(\"creating file {:?}\", path);"},{"Add":" *file = std::fs::File::create(&path)?;"},{"Add":" } else {"},{"Add":" // Else, just finish."},{"Add":" debug!(\"dropping channel\");"},{"Add":" *sender = None;"},{"Add":" break;"},{"Add":" }"},{"Add":" } else {"},{"Add":" // not enough data, we need more."},{"Add":" file.write_all(&data[p..])?;"},{"Add":" file.flush()?;"},{"Add":" *remaining_len -= data.len() - p;"},{"Add":" debug!(\"need more data\");"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"finished, {:?} {:?}\", p, data.len());"},{"Add":" }"},{"Add":" State::Changelist { ref mut sender } => {"},{"Add":" debug!(\"state changelist\");"},{"Add":" if &data[..] == b\"\\n\" {"},{"Add":" debug!(\"log done\");"},{"Add":" sender.send(None).await.unwrap_or(())"},{"Add":" } else if let Ok(data) = std::str::from_utf8(&data) {"},{"Add":" for l in data.lines() {"},{"Add":" if !l.is_empty() {"},{"Add":" debug!(\"line = {:?}\", l);"},{"Add":" let (n, h, m) = parse_line(l)?;"},{"Add":" sender.send(Some((n, h, m))).await.unwrap_or(());"},{"Add":" } else {"},{"Add":" sender.send(None).await.unwrap_or(());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" State::Channel { ref mut sender } => sender.send(data).await?,"},{"Add":" State::Archive { ref mut sender, ref mut w, ref mut len, ref mut len_n, ref mut conflicts } => {"},{"Add":" let mut off = 0;"},{"Add":" while *len_n < 16 && off < data.len() {"},{"Add":" if *len_n < 8 {"},{"Add":" *len = (*len << 8) | (data[off] as u64);"},{"Add":" } else {"},{"Add":" *conflicts = (*conflicts << 8) | (data[off] as u64);"},{"Add":" }"},{"Add":" *len_n += 1;"},{"Add":" off += 1;"},{"Add":" }"},{"Add":" if *len_n >= 16 {"},{"Add":" w.write_all(&data[off..])?;"},{"Add":" *len -= (data.len() - off) as u64;"},{"Add":" if *len == 0 {"},{"Add":" if let Some(sender) = sender.take() {"},{"Add":" sender.send(*conflicts).unwrap_or(())"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" State::None => {"},{"Add":" debug!(\"None state\");"},{"Add":" }"},{"Add":" }"},{"Add":" Ok((self, session))"},{"Add":" })"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":515,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36250}],"down_context":[{"change":6,"pos":36250}],"flag":"","start":7760,"end":7950,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" debug!(\"get_state\");"},{"Add":" let (sender, receiver) = tokio::sync::oneshot::channel();"},{"Add":" *self.state.lock().await = State::State {"},{"Add":" sender: Some(sender),"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":530,"ins":{"up_context":[{"change":6,"pos":36582}],"down_context":[{"change":6,"pos":37991}],"flag":"","start":7951,"end":7979,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36582},"to":{"change":6,"start":36582,"end":37991},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" Ok(receiver.await?)"}],"del_contents":[{"Del":" while let Some(msg) = self.c.wait().await {\n match msg {\n thrussh::ChannelMsg::Data { data } => {\n // If we can't parse `data` (for example if the\n // remote returns the standard \"-\\n\"), this\n // returns None.\n let mut s = std::str::from_utf8(&data)?.split(' ');\n debug!(\"s = {:?}\", s);\n if let (Some(n), Some(m)) = (s.next(), s.next()) {\n let n = n.parse().unwrap();\n return Ok(Some((n, Merkle::from_base32(m.trim().as_bytes()).unwrap())));\n } else {\n break;\n }\n }\n thrussh::ChannelMsg::ExtendedData { data, ext } => {\n if ext == 1 {\n debug!(\"{:?}\", std::str::from_utf8(&data))\n }\n }\n thrussh::ChannelMsg::Eof => {}\n thrussh::ChannelMsg::ExitStatus { exit_status } => {\n if exit_status != 0 {\n return Err((Error::RemoteExit {\n status: exit_status,\n })\n .into());\n }\n }\n msg => panic!(\"wrong message {:?}\", msg),\n }\n }\n Ok(None)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":533,"ins":{"up_context":[{"change":6,"pos":37998}],"down_context":[{"change":6,"pos":38043}],"flag":"","start":7980,"end":8042,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37998},"to":{"change":6,"start":37998,"end":38043},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" pub async fn archive("}],"del_contents":[{"Del":" pub async fn archive(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":537,"ins":{"up_context":[{"change":6,"pos":38136}],"down_context":[{"change":6,"pos":38154}],"flag":"","start":8043,"end":8057,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":38136},"to":{"change":6,"start":38136,"end":38154},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" w: W,"}],"del_contents":[{"Del":" mut w: W,\n"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":539,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38192}],"down_context":[{"change":6,"pos":38192}],"flag":"","start":8058,"end":8344,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" debug!(\"archive\");"},{"Add":" let (sender, receiver) = tokio::sync::oneshot::channel();"},{"Add":" *self.state.lock().await = State::Archive {"},{"Add":" sender: Some(sender),"},{"Add":" len: 0,"},{"Add":" conflicts: 0,"},{"Add":" len_n: 0,"},{"Add":" w: Box::new(w),"},{"Add":" };"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":572,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":39070},"to":{"change":6,"start":39070,"end":40659},"introduced_by":6}],"inode":{"change":6,"pos":25380}}},"contents":[{"Del":" }\n let mut len = 0;\n let mut conflicts = 0;\n let mut len_n = 0;\n while let Some(msg) = self.c.wait().await {\n match msg {\n thrussh::ChannelMsg::Data { data } => {\n let mut off = 0;\n while len_n < 16 && off < data.len() {\n if len_n < 8 {\n len = (len << 8) | (data[off] as u64);\n } else {\n conflicts = (conflicts << 8) | (data[off] as u64);\n }\n len_n += 1;\n off += 1;\n }\n if len_n >= 16 {\n w.write_all(&data[off..])?;\n len -= (data.len() - off) as u64;\n if len == 0 {\n break;\n }\n }\n }\n thrussh::ChannelMsg::ExtendedData { data, ext } => {\n if ext == 1 {\n debug!(\"{:?}\", std::str::from_utf8(&data))\n }\n }\n thrussh::ChannelMsg::Eof => {}\n thrussh::ChannelMsg::ExitStatus { exit_status } => {\n if exit_status != 0 {\n return Err((Error::RemoteExit {\n status: exit_status,\n })\n .into());\n }\n }\n msg => panic!(\"wrong message {:?}\", msg),\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":573,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":40669}],"down_context":[{"change":6,"pos":40669}],"flag":"","start":8345,"end":8398,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" let conflicts = receiver.await.unwrap_or(0);"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":621,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":42222}],"down_context":[{"change":6,"pos":42222}],"flag":"","start":8399,"end":8554,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" let (sender, mut receiver) = tokio::sync::mpsc::channel(10);"},{"Add":" *self.state.lock().await = State::Changelist {"},{"Add":" sender,"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":635,"ins":{"up_context":[{"change":6,"pos":42593}],"down_context":[{"change":6,"pos":44262}],"flag":"","start":8555,"end":8669,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42593},"to":{"change":6,"start":42593,"end":44262},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" while let Some(Some((n, h, m))) = receiver.recv().await {"},{"Add":" txn.put_remote(remote, n, (h, m))?;"}],"del_contents":[{"Del":" 'msg: while let Some(msg) = self.c.wait().await {\n debug!(\"msg = {:?}\", msg);\n match msg {\n thrussh::ChannelMsg::Data { data } => {\n if &data[..] == b\"\\n\" {\n debug!(\"log done\");\n break;\n } else if let Ok(data) = std::str::from_utf8(&data) {\n for l in data.lines() {\n if !l.is_empty() {\n debug!(\"line = {:?}\", l);\n let (n, h, m) = parse_line(l)?;\n txn.put_remote(remote, n, (h, m))?;\n } else {\n break 'msg;\n }\n }\n }\n }\n thrussh::ChannelMsg::ExtendedData { data, ext } => {\n debug!(\"{:?} {:?}\", ext, std::str::from_utf8(&data[..]));\n /*return Err((crate::Error::Remote {\n msg: std::str::from_utf8(&data[..]).unwrap().to_string()\n }).into())*/\n }\n thrussh::ChannelMsg::WindowAdjusted { .. } => {}\n thrussh::ChannelMsg::Eof => {}\n thrussh::ChannelMsg::ExitStatus { exit_status } => {\n if exit_status != 0 {\n return Err((Error::RemoteExit {\n status: exit_status,\n })\n .into());\n }\n }\n msg => panic!(\"wrong message {:?}\", msg),\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":672,"ins":{"up_context":[{"change":6,"pos":45411}],"down_context":[{"change":6,"pos":45451}],"flag":"","start":8670,"end":8705,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":45411},"to":{"change":6,"start":45411,"end":45451},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" pub async fn download_changes("}],"del_contents":[{"Del":" pub async fn start_change_download(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":674,"ins":{"up_context":[{"change":6,"pos":45470}],"down_context":[{"change":6,"pos":45507}],"flag":"","start":8706,"end":8855,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":45470},"to":{"change":6,"start":45470,"end":45507},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" c: &[libpijul::pristine::Hash],"},{"Add":" sender: &mut tokio::sync::mpsc::Sender,"},{"Add":" changes_dir: &mut PathBuf,"}],"del_contents":[{"Del":" c: libpijul::pristine::Hash,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":679,"ins":{"up_context":[{"change":6,"pos":45564}],"down_context":[{"change":6,"pos":46489}],"flag":"","start":8856,"end":9043,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":45564},"to":{"change":6,"start":45564,"end":46489},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" let (sender_, mut recv) = tokio::sync::mpsc::channel(100);"},{"Add":" let mut path = changes_dir.clone();"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut path, &c[0]);"}],"del_contents":[{"Del":" self.run_protocol().await?;\n debug!(\"download_change {:?}\", full);\n if full {\n self.c\n .data(format!(\"change {}\\n\", c.to_base32()).as_bytes())\n .await?;\n } else {\n self.c\n .data(format!(\"partial {}\\n\", c.to_base32()).as_bytes())\n .await?;\n }\n Ok(())\n }\n\n pub async fn wait_downloads(\n &mut self,\n changes_dir: &Path,\n hashes: &[libpijul::pristine::Hash],\n send: &mut tokio::sync::mpsc::Sender,\n ) -> Result<(), anyhow::Error> {\n debug!(\"wait_downloads\");\n if !self.is_running {\n return Ok(());\n }\n let mut remaining_len = 0;\n let mut current: usize = 0;\n let mut path = changes_dir.to_path_buf();\n libpijul::changestore::filesystem::push_filename(&mut path, &hashes[current]);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":684,"ins":{"up_context":[{"change":6,"pos":46580}],"down_context":[{"change":6,"pos":49729}],"flag":"","start":9044,"end":9927,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":46580},"to":{"change":6,"start":46580,"end":49729},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" let file = std::fs::File::create(&path)?;"},{"Add":" *self.state.lock().await = State::Changes {"},{"Add":" sender: Some(sender_),"},{"Add":" remaining_len: 0,"},{"Add":" path,"},{"Add":" file,"},{"Add":" hashes: c.to_vec(),"},{"Add":" current: 0,"},{"Add":" };"},{"Add":" self.run_protocol().await?;"},{"Add":" for c in c {"},{"Add":" debug!(\"download_change {:?} {:?}\", c, full);"},{"Add":" if full {"},{"Add":" self.c"},{"Add":" .data(format!(\"change {}\\n\", c.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" } else {"},{"Add":" self.c"},{"Add":" .data(format!(\"partial {}\\n\", c.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" }"},{"Add":" }"},{"Add":" while let Some(_hash) = recv.recv().await {"},{"Add":" debug!(\"received hash {:?}\", _hash);"},{"Add":" if sender.send(_hash).await.is_err() {"},{"Add":" break"}],"del_contents":[{"Del":" let mut file = std::fs::File::create(&path)?;\n 'outer: while let Some(msg) = self.c.wait().await {\n match msg {\n thrussh::ChannelMsg::Data { data } => {\n debug!(\"data = {:?}\", &data[..]);\n let mut p = 0;\n while p < data.len() {\n if remaining_len == 0 {\n remaining_len = (&data[p..]).read_u64::().unwrap() as usize;\n p += 8;\n debug!(\"remaining_len = {:?}\", remaining_len);\n }\n if data.len() >= p + remaining_len {\n file.write_all(&data[p..p + remaining_len])?;\n // We have enough data to write the\n // file, write it and move to the next\n // file.\n p += remaining_len;\n remaining_len = 0;\n file.flush()?;\n let mut final_path = path.clone();\n final_path.set_extension(\"change\");\n debug!(\"moving {:?} to {:?}\", path, final_path);\n std::fs::rename(&path, &final_path)?;\n debug!(\"sending\");\n send.send(hashes[current].clone()).await.unwrap();\n debug!(\"sent\");\n current += 1;\n if current < hashes.len() {\n // If we're still waiting for\n // another change.\n libpijul::changestore::filesystem::pop_filename(&mut path);\n libpijul::changestore::filesystem::push_filename(\n &mut path,\n &hashes[current],\n );\n std::fs::create_dir_all(&path.parent().unwrap())?;\n path.set_extension(\"\");\n file = std::fs::File::create(&path)?;\n } else {\n // Else, just finish.\n break 'outer;\n }\n } else {\n // not enough data, we need more.\n file.write_all(&data[p..])?;\n remaining_len -= data.len() - p;\n break;\n }\n }\n }\n thrussh::ChannelMsg::ExitStatus { exit_status } => {\n debug!(\"exit: {:?}\", exit_status);\n if exit_status != 0 {\n error!(\"Remote command returned {:?}\", exit_status)\n }\n self.is_running = false;\n return Ok(());\n }\n msg => {\n debug!(\"{:?}\", msg);\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":712,"ins":{"up_context":[{"change":6,"pos":49753}],"down_context":[{"change":6,"pos":49799}],"flag":"","start":9928,"end":9964,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49753},"to":{"change":6,"start":49753,"end":49799},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" debug!(\"done downloading\");"}],"del_contents":[{"Del":" debug!(\"done waiting for downloads\");\n"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":723,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":50033}],"down_context":[{"change":6,"pos":50033}],"flag":"","start":9965,"end":10092,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" let (sender, mut recv) = tokio::sync::mpsc::channel(10);"},{"Add":" *self.state.lock().await = State::Channel { sender };"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":726,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":50069}],"down_context":[{"change":6,"pos":50069}],"flag":"","start":10093,"end":10126,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":" debug!(\"clone channel\");"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":730,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":50173}],"down_context":[{"change":6,"pos":50173}],"flag":"","start":10127,"end":10128,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":734,"ins":{"up_context":[{"change":6,"pos":50331}],"down_context":[{"change":6,"pos":51267}],"flag":"","start":10129,"end":10253,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":50331},"to":{"change":6,"start":50331,"end":51267},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" while let Some(msg) = recv.recv().await {"},{"Add":" if from_dump.read(&msg)? {"},{"Add":" break;"}],"del_contents":[{"Del":" while let Some(msg) = self.c.wait().await {\n match msg {\n thrussh::ChannelMsg::Data { data } => {\n debug!(\"data = {:?}\", &data[..]);\n if from_dump.read(&data)? {\n break;\n }\n }\n thrussh::ChannelMsg::ExtendedData { data, ext } => {\n debug!(\"data = {:?}, ext = {:?}\", &data[..], ext);\n }\n thrussh::ChannelMsg::ExitStatus { exit_status } => {\n if exit_status != 0 {\n error!(\"Remote command returned {:?}\", exit_status)\n }\n self.is_running = false;\n break;\n }\n msg => {\n debug!(\"msg = {:?}\", msg);\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":764,"ins":{"up_context":[{"change":6,"pos":52222}],"down_context":[{"change":6,"pos":52289}],"flag":"","start":10254,"end":10334,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":52222},"to":{"change":6,"start":52222,"end":52289},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" self.download_changes(&hashes, &mut send, &mut repo.changes_dir, false)"}],"del_contents":[{"Del":" self.wait_downloads(&repo.changes_dir, &hashes, &mut send)\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":0,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":52474},"to":{"change":4,"start":386,"end":406},"introduced_by":4}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":"use std::io::Write;\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":438}],"down_context":[{"change":4,"pos":438}],"flag":"","start":10335,"end":10355,"inode":{"change":6,"pos":52474}}},"contents":[{"Add":"use std::sync::Arc;"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":17,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":52768}],"down_context":[{"change":6,"pos":52768}],"flag":"","start":10356,"end":10384,"inode":{"change":6,"pos":52474}}},"contents":[{"Add":"pub mod http;"},{"Add":"use http::*;"},{"Add":""}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":28,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":52851},"to":{"change":6,"start":52851,"end":52973},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":"pub struct Http {\n pub url: String,\n pub channel: String,\n pub client: reqwest::Client,\n pub name: String,\n}\n\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":90,"ins":{"up_context":[{"change":6,"pos":54719}],"down_context":[{"change":6,"pos":54745}],"flag":"","start":10385,"end":10431,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":54719},"to":{"change":6,"start":54719,"end":54745},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" pristine: Arc::new(pristine),"}],"del_contents":[{"Del":" pristine,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":278,"ins":{"up_context":[{"change":6,"pos":60669}],"down_context":[{"change":6,"pos":60714}],"flag":"","start":10432,"end":10494,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":60669},"to":{"change":6,"start":60669,"end":60714},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" pub async fn archive("}],"del_contents":[{"Del":" pub async fn archive(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":387,"ins":{"up_context":[{"change":6,"pos":65147}],"down_context":[{"change":6,"pos":65180}],"flag":"","start":10495,"end":10543,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":65147},"to":{"change":2,"start":2309,"end":2397},"introduced_by":2}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" pub async fn upload_changes("}],"del_contents":[{"Del":" pub async fn upload_changes(\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":389,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":65199},"to":{"change":2,"start":2398,"end":2420},"introduced_by":2}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" repo: &mut W,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":423,"ins":{"up_context":[{"change":2,"pos":2665}],"down_context":[{"change":2,"pos":2745}],"flag":"","start":10544,"end":10618,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2665},"to":{"change":2,"start":2665,"end":2745},"introduced_by":2}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" local::upload_changes(&store, txn, &mut channel, changes)"}],"del_contents":[{"Del":" local::upload_changes(&store, repo, txn, &mut channel, changes)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":430,"ins":{"up_context":[{"change":6,"pos":66651}],"down_context":[{"change":6,"pos":66691}],"flag":"","start":10619,"end":10654,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":66651},"to":{"change":6,"start":66651,"end":66691},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" pub async fn download_changes("}],"del_contents":[{"Del":" pub async fn start_change_download(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":432,"ins":{"up_context":[{"change":6,"pos":66710}],"down_context":[{"change":6,"pos":66747}],"flag":"","start":10655,"end":10772,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":66710},"to":{"change":6,"start":66710,"end":66747},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" hashes: &[libpijul::pristine::Hash],"},{"Add":" send: &mut tokio::sync::mpsc::Sender,"}],"del_contents":[{"Del":" c: libpijul::pristine::Hash,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":437,"ins":{"up_context":[{"change":6,"pos":66834}],"down_context":[{"change":6,"pos":67210}],"flag":"","start":10773,"end":10809,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":66834},"to":{"change":6,"start":66834,"end":67210},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" debug!(\"download_changes\");"}],"del_contents":[{"Del":" debug!(\"start_change_download\");\n libpijul::changestore::filesystem::push_filename(path, &c);\n if std::fs::metadata(&path).is_ok() && !full {\n debug!(\"metadata {:?} ok\", path);\n libpijul::changestore::filesystem::pop_filename(path);\n return Ok(false);\n }\n std::fs::create_dir_all(&path.parent().unwrap())?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":439,"ins":{"up_context":[{"change":6,"pos":67232}],"down_context":[{"change":2,"pos":2760}],"flag":"","start":10810,"end":11092,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":67232},"to":{"change":6,"start":67232,"end":68044},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" RemoteRepo::Local(ref mut l) => l.download_changes(hashes, send, path).await?,"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.download_changes(hashes, send, path, full).await?,"},{"Add":" RemoteRepo::Http(ref mut h) => h.download_changes(hashes, send, path, full).await?,"}],"del_contents":[{"Del":" RemoteRepo::Local(ref mut l) => l.start_change_download(c, path).await?,\n RemoteRepo::Ssh(ref mut s) => s.start_change_download(c, full).await?,\n RemoteRepo::Http(ref h) => {\n let mut f = std::fs::File::create(&path)?;\n let c32 = c.to_base32();\n let url = format!(\"{}/{}\", h.url, DOT_DIR);\n let mut res = h.client.get(&url).query(&[(\"change\", c32)]).send().await?;\n if !res.status().is_success() {\n return Err((crate::Error::Http {\n status: res.status(),\n })\n .into());\n }\n while let Some(chunk) = res.chunk().await? {\n f.write_all(&chunk)?;\n }\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":447,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":68182},"to":{"change":6,"start":68182,"end":68729},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" }\n\n pub async fn wait_downloads(\n &mut self,\n changes_dir: &Path,\n hashes: &[libpijul::pristine::Hash],\n send: &mut tokio::sync::mpsc::Sender,\n ) -> Result<(), anyhow::Error> {\n if hashes.is_empty() {\n return Ok(());\n }\n if let RemoteRepo::Ssh(ref mut s) = *self {\n s.wait_downloads(changes_dir, hashes, send).await?\n } else {\n for h in hashes {\n send.send(*h).await?\n }\n }\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":449,"ins":{"up_context":[{"change":6,"pos":68736}],"down_context":[{"change":6,"pos":68803}],"flag":"","start":11093,"end":11167,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":68736},"to":{"change":6,"start":68736,"end":68803},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" pub async fn pull<'a, T: MutTxnTExt + TxnTExt>("},{"Add":" &'a mut self,"}],"del_contents":[{"Del":" pub async fn pull(\n &mut self,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":461,"ins":{"up_context":[{"change":6,"pos":69159}],"down_context":[{"change":6,"pos":69754}],"flag":"","start":11168,"end":11284,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":69159},"to":{"change":6,"start":69159,"end":69754},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" self"},{"Add":" .download_changes(&to_download_, &mut send, &mut change_path_, false)"},{"Add":" .await?;"}],"del_contents":[{"Del":" let mut self_ = std::mem::replace(self, RemoteRepo::None);\n let t = tokio::spawn(async move {\n let mut hashes = Vec::new();\n for h in to_download_.iter() {\n if self_\n .start_change_download(*h, &mut change_path_, false)\n .await?\n {\n hashes.push(*h);\n }\n }\n debug!(\"hashes = {:?}\", hashes);\n self_\n .wait_downloads(&change_path_, &hashes, &mut send)\n .await?;\n Ok(self_)\n });\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":489,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":70763},"to":{"change":6,"start":70763,"end":70859},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" let r: Result<_, anyhow::Error> = t.await?;\n debug!(\"done\");\n *self = r?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":505,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":71428},"to":{"change":6,"start":71428,"end":71469},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" let mut hashes = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":506,"ins":{"up_context":[{"change":6,"pos":71529}],"down_context":[{"change":6,"pos":71732}],"flag":"","start":11285,"end":11427,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":71529},"to":{"change":6,"start":71529,"end":71732},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" self_"},{"Add":" .download_changes(&[hash], &mut send_signal, &mut change_path_, false)"},{"Add":" .await?;"}],"del_contents":[{"Del":" if self_\n .start_change_download(hash, &mut change_path_, false)\n .await?\n {\n hashes.push(hash);\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":510,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":71746},"to":{"change":6,"start":71746,"end":71908},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" debug!(\"hashes = {:?}\", hashes);\n self_\n .wait_downloads(&change_path_, &hashes, &mut send_signal)\n .await?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":606,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":75405},"to":{"change":6,"start":75405,"end":75446},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" let mut hashes = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":608,"ins":{"up_context":[{"change":6,"pos":75562}],"down_context":[{"change":6,"pos":75825}],"flag":"","start":11428,"end":11562,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":75562},"to":{"change":6,"start":75562,"end":75825},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" self_"},{"Add":" .download_changes(&[h], &mut send_sig, &mut changes_dir, true)"},{"Add":" .await?;"}],"del_contents":[{"Del":" if self_\n .start_change_download(h, &mut changes_dir, true)\n .await?\n {\n debug!(\"push\");\n hashes.push(h);\n }\n debug!(\"done\");\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":612,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":75839},"to":{"change":6,"start":75839,"end":75983},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" debug!(\"waiting\");\n self_\n .wait_downloads(&changes_dir, &hashes, &mut send_sig)\n .await?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":687,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78459},"to":{"change":6,"start":78459,"end":78533},"introduced_by":6}],"inode":{"change":6,"pos":52474}}},"contents":[{"Del":" // let pullable = self.pullable(txn, local_channel, path).await?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":0,"ins":{"up_context":[{"change":6,"pos":79745}],"down_context":[{"change":4,"pos":534}],"flag":"","start":11563,"end":11607,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":79745},"to":{"change":4,"start":502,"end":534},"introduced_by":4}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":"use std::path::PathBuf;"},{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::path::{Path, PathBuf};\n"}]}},{"Edit":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":79901}],"down_context":[{"change":6,"pos":79901}],"flag":"","start":11608,"end":11625,"inode":{"change":6,"pos":79745}}},"contents":[{"Add":"#[derive(Clone)]"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":14,"ins":{"up_context":[{"change":6,"pos":80020}],"down_context":[{"change":6,"pos":80079}],"flag":"","start":11626,"end":11690,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":80020},"to":{"change":6,"start":80020,"end":80079},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" pub pristine: Arc,"}],"del_contents":[{"Del":" pub pristine: libpijul::pristine::sanakirja::Pristine,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":109,"ins":{"up_context":[{"change":6,"pos":83453}],"down_context":[{"change":6,"pos":83493}],"flag":"","start":11691,"end":11726,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":83453},"to":{"change":6,"start":83453,"end":83493},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" pub async fn download_changes("}],"del_contents":[{"Del":" pub async fn start_change_download(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":111,"ins":{"up_context":[{"change":6,"pos":83512}],"down_context":[{"change":6,"pos":83570}],"flag":"","start":11727,"end":11871,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":83512},"to":{"change":6,"start":83512,"end":83570},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" c: &[libpijul::pristine::Hash],"},{"Add":" send: &mut tokio::sync::mpsc::Sender,"},{"Add":" mut path: &mut PathBuf,"}],"del_contents":[{"Del":" c: libpijul::pristine::Hash,\n path: &Path,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":115,"ins":{"up_context":[{"change":6,"pos":83607}],"down_context":[{"change":2,"pos":3741}],"flag":"","start":11872,"end":12742,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":83607},"to":{"change":6,"start":83607,"end":83755},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":83755},"to":{"change":2,"start":3622,"end":3741},"introduced_by":2}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" for c in c {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, c);"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut path, c);"},{"Add":" if std::fs::metadata(&path).is_ok() {"},{"Add":" debug!(\"metadata {:?} ok\", path);"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut path);"},{"Add":" continue"},{"Add":" }"},{"Add":" std::fs::create_dir_all(&path.parent().unwrap())?;"},{"Add":" if std::fs::hard_link(&self.changes_dir, &path).is_err() {"},{"Add":" std::fs::copy(&self.changes_dir, &path)?;"},{"Add":" }"},{"Add":" debug!(\"hard link done\");"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut path);"},{"Add":" debug!(\"sent\");"},{"Add":" send.send(*c).await.unwrap();"}],"del_contents":[{"Del":" libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);\n debug!(\"hard link {:?} {:?}\", self.changes_dir, path);\n"},{"Del":" if std::fs::hard_link(&self.changes_dir, path).is_err() {\n std::fs::copy(&self.changes_dir, path)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":133,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":3751},"to":{"change":6,"start":83809,"end":83947},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":83809},"to":{"change":6,"start":83809,"end":83947},"introduced_by":6}],"inode":{"change":6,"pos":79745}}},"contents":[{"Del":" debug!(\"hard link done\");\n libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);\n debug!(\"sent\");\n"}]}},{"Replacement":{"inode":{"change":6,"pos":191083},"path":"pijul/src/commands/archive.rs","line":65,"ins":{"up_context":[{"change":2,"pos":8755}],"down_context":[{"change":2,"pos":8811}],"flag":"","start":12743,"end":12795,"inode":{"change":6,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":8755},"to":{"change":2,"start":8755,"end":8811},"introduced_by":2}],"inode":{"change":6,"pos":191083}},"ins_contents":[{"Add":" let f = std::fs::File::create(&p)?;"}],"del_contents":[{"Del":" let mut f = std::fs::File::create(&p)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":191083},"path":"pijul/src/commands/archive.rs","line":67,"ins":{"up_context":[{"change":2,"pos":8834}],"down_context":[{"change":2,"pos":8916}],"flag":"","start":12796,"end":12873,"inode":{"change":6,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":8834},"to":{"change":2,"start":8834,"end":8916},"introduced_by":2}],"inode":{"change":6,"pos":191083}},"ins_contents":[{"Add":" .archive(self.prefix, state.map(|x| (x, &extra[..])), f)"}],"del_contents":[{"Del":" .archive(self.prefix, state.map(|x| (x, &extra[..])), &mut f)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":196374},"path":"pijul/Cargo.toml","line":58,"ins":{"up_context":[{"change":6,"pos":197741}],"down_context":[{"change":5,"pos":19}],"flag":"","start":12874,"end":12893,"inode":{"change":6,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":197741},"to":{"change":5,"start":0,"end":19},"introduced_by":5}],"inode":{"change":6,"pos":196374}},"ins_contents":[{"Add":"thrussh = \"0.29.9\""}],"del_contents":[{"Del":"thrussh = \"0.29.8\"\n"}]}},{"Replacement":{"inode":{"change":6,"pos":1030385},"path":"Cargo.lock","line":1977,"ins":{"up_context":[{"change":6,"pos":1078238}],"down_context":[{"change":6,"pos":1078400}],"flag":"","start":12894,"end":12913,"inode":{"change":6,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1078238},"to":{"change":3,"start":1528,"end":1547},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1547},"to":{"change":6,"start":1078257,"end":1078322},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1078257},"to":{"change":6,"start":1078257,"end":1078322},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1078322},"to":{"change":3,"start":1548,"end":1626},"introduced_by":3}],"inode":{"change":6,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.29.8\""}],"del_contents":[{"Del":"version = \"0.29.6\"\n"},{"Del":"source = \"registry+https://github.com/rust-lang/crates.io-index\"\n"},{"Del":"checksum = \"907849cfee4388f2d6bb1558f1d72ef80d70b5cb8d3583fb2c06391f9c9d71b4\"\n"}]}},{"Replacement":{"inode":{"change":6,"pos":1030385},"path":"Cargo.lock","line":1995,"ins":{"up_context":[{"change":6,"pos":1078612}],"down_context":[{"change":6,"pos":1078631}],"flag":"","start":12914,"end":12933,"inode":{"change":6,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1078612},"to":{"change":3,"start":1648,"end":1667},"introduced_by":3}],"inode":{"change":6,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.18.8\""}],"del_contents":[{"Del":"version = \"0.18.3\"\n"}]}},{"Replacement":{"inode":{"change":6,"pos":1030385},"path":"Cargo.lock","line":1997,"ins":{"up_context":[{"change":6,"pos":1078696}],"down_context":[{"change":6,"pos":1078774}],"flag":"","start":12934,"end":13012,"inode":{"change":6,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1078696},"to":{"change":3,"start":1668,"end":1746},"introduced_by":3}],"inode":{"change":6,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"b1c6b62fd561e81bbbaf6620f29d9d763dcede2925b96ebf3fe20f819e949ffa\""}],"del_contents":[{"Del":"checksum = \"086807e338da6863b2f151bf898a0ba233dec6e30f626982346679709decd23d\"\n"}]}}],"owner":"irevoire","repo":"pijul","token":"BvT9o4fJdsQENDrO80SdAxFaTkE9i8p/YHoQeJVUf68=","login":null}

…

Dependencies

Change contents