{"header":{"message":"Fixing a panic in pull","description":null,"timestamp":"2021-01-04T17:19:47.412799817Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","authors":[],"deps":{"hashes":[["KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","Fixing a panic in pull"],["AA",null],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","Forgot to add remote::http"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"]],"deps":["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":52474},"path":"pijul/src/remote/mod.rs","line":259,"ins":{"up_context":[{"change":3,"pos":59320}],"down_context":[{"change":3,"pos":1926}],"flag":"BLOCK","start":0,"end":67,"inode":{"change":3,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":59320},"to":{"change":3,"start":59320,"end":59915},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":59915},"to":{"change":2,"start":8770,"end":8829},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":8829},"to":{"change":3,"start":60067,"end":60604},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60067},"to":{"change":3,"start":60067,"end":60604},"introduced_by":3}],"inode":{"change":3,"pos":52474}},"ins_contents":[{"Add":" RemoteRepo::Http(ref mut h) => h.get_state(mid).await,"}],"del_contents":[{"Del":" RemoteRepo::Http(ref h) => {\n debug!(\"get_state {:?}\", h.url);\n let url = format!(\"{}/{}\", h.url, DOT_DIR);\n let q = if let Some(mid) = mid {\n [\n (\"state\", format!(\"{}\", mid)),\n (\"channel\", h.channel.clone()),\n ]\n } else {\n [(\"state\", String::new()), (\"channel\", h.channel.clone())]\n };\n let res = h.client.get(&url).query(&q).send().await?;\n if !res.status().is_success() {\n"},{"Del":" bail!(\"HTTP error {:?}\", res.status())\n"},{"Del":" }\n let resp = res.bytes().await?;\n let resp = std::str::from_utf8(&resp)?;\n debug!(\"resp = {:?}\", resp);\n let mut s = resp.split(' ');\n if let (Some(n), Some(m)) = (\n s.next().and_then(|s| s.parse().ok()),\n s.next().and_then(|m| Merkle::from_base32(m.as_bytes())),\n ) {\n Ok(Some((n, m)))\n } else {\n Ok(None)\n }\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":52474},"path":"pijul/src/remote/mod.rs","line":275,"ins":{"up_context":[{"change":3,"pos":60807}],"down_context":[{"change":3,"pos":60825}],"flag":"BLOCK","start":68,"end":82,"inode":{"change":3,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60807},"to":{"change":3,"start":60807,"end":60825},"introduced_by":3}],"inode":{"change":3,"pos":52474}},"ins_contents":[{"Add":" w: W,"}],"del_contents":[{"Del":" mut w: W,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":52474},"path":"pijul/src/remote/mod.rs","line":294,"ins":{"up_context":[{"change":3,"pos":61877}],"down_context":[{"change":3,"pos":2197}],"flag":"BLOCK","start":83,"end":161,"inode":{"change":3,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":61877},"to":{"change":3,"start":61877,"end":62677},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":62677},"to":{"change":2,"start":9111,"end":9170},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":9170},"to":{"change":3,"start":62829,"end":63484},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":62829},"to":{"change":3,"start":62829,"end":63484},"introduced_by":3}],"inode":{"change":3,"pos":52474}},"ins_contents":[{"Add":" RemoteRepo::Http(ref mut h) => h.archive(prefix, state, w).await,"}],"del_contents":[{"Del":" RemoteRepo::Http(ref h) => {\n let url = h.url.clone() + \"/\" + DOT_DIR;\n let res = h.client.get(&url).query(&[(\"channel\", &h.channel)]);\n let res = if let Some((ref state, ref extra)) = state {\n let mut q = vec![(\"archive\".to_string(), state.to_base32())];\n if let Some(pre) = prefix {\n q.push((\"outputPrefix\".to_string(), pre));\n }\n for e in extra.iter() {\n q.push((\"change\".to_string(), e.to_base32()))\n }\n res.query(&q)\n } else {\n res\n };\n let res = res.send().await?;\n if !res.status().is_success() {\n"},{"Del":" bail!(\"HTTP error {:?}\", res.status())\n"},{"Del":" }\n use futures_util::StreamExt;\n let mut stream = res.bytes_stream();\n let mut conflicts = 0;\n let mut n = 0;\n while let Some(item) = stream.next().await {\n let item = item?;\n let mut off = 0;\n while n < 8 && off < item.len() {\n conflicts = (conflicts << 8) | (item[off] as u64);\n off += 1;\n n += 1\n }\n w.write_all(&item[off..])?;\n }\n Ok(conflicts as u64)\n }\n"}]}},{"Edit":{"inode":{"change":8,"pos":10},"path":"pijul/src/remote/http.rs","line":212,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":6503}],"down_context":[{"change":9,"pos":6503}],"flag":"BLOCK","start":162,"end":2760,"inode":{"change":8,"pos":10}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" pub async fn get_state("},{"Add":" &mut self,"},{"Add":" mid: Option,"},{"Add":" ) -> Result, anyhow::Error> {"},{"Add":" debug!(\"get_state {:?}\", self.url);"},{"Add":" let url = format!(\"{}/{}\", self.url, super::DOT_DIR);"},{"Add":" let q = if let Some(mid) = mid {"},{"Add":" ["},{"Add":" (\"state\", format!(\"{}\", mid)),"},{"Add":" (\"channel\", self.channel.clone()),"},{"Add":" ]"},{"Add":" } else {"},{"Add":" [(\"state\", String::new()), (\"channel\", self.channel.clone())]"},{"Add":" };"},{"Add":" let res = self.client.get(&url).query(&q).send().compat().await?;"},{"Add":" if !res.status().is_success() {"},{"Add":" bail!(\"HTTP error {:?}\", res.status())"},{"Add":" }"},{"Add":" let resp = res.bytes().compat().await?;"},{"Add":" let resp = std::str::from_utf8(&resp)?;"},{"Add":" debug!(\"resp = {:?}\", resp);"},{"Add":" let mut s = resp.split(' ');"},{"Add":" if let (Some(n), Some(m)) = ("},{"Add":" s.next().and_then(|s| s.parse().ok()),"},{"Add":" s.next()"},{"Add":" .and_then(|m| libpijul::Merkle::from_base32(m.as_bytes())),"},{"Add":" ) {"},{"Add":" Ok(Some((n, m)))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub async fn archive("},{"Add":" &mut self,"},{"Add":" prefix: Option,"},{"Add":" state: Option<(libpijul::Merkle, &[Hash])>,"},{"Add":" mut w: W,"},{"Add":" ) -> Result {"},{"Add":" let url = self.url.clone() + \"/\" + super::DOT_DIR;"},{"Add":" let res = self.client.get(&url).query(&[(\"channel\", &self.channel)]);"},{"Add":" let res = if let Some((ref state, ref extra)) = state {"},{"Add":" let mut q = vec![(\"archive\".to_string(), state.to_base32())];"},{"Add":" if let Some(pre) = prefix {"},{"Add":" q.push((\"outputPrefix\".to_string(), pre));"},{"Add":" }"},{"Add":" for e in extra.iter() {"},{"Add":" q.push((\"change\".to_string(), e.to_base32()))"},{"Add":" }"},{"Add":" res.query(&q)"},{"Add":" } else {"},{"Add":" res"},{"Add":" };"},{"Add":" let res = res.send().compat().await?;"},{"Add":" if !res.status().is_success() {"},{"Add":" bail!(\"HTTP error {:?}\", res.status())"},{"Add":" }"},{"Add":" use futures_util::StreamExt;"},{"Add":" let mut stream = res.bytes_stream();"},{"Add":" let mut conflicts = 0;"},{"Add":" let mut n = 0;"},{"Add":" while let Some(item) = stream.next().compat().await {"},{"Add":" let item = item?;"},{"Add":" let mut off = 0;"},{"Add":" while n < 8 && off < item.len() {"},{"Add":" conflicts = (conflicts << 8) | (item[off] as u64);"},{"Add":" off += 1;"},{"Add":" n += 1"},{"Add":" }"},{"Add":" w.write_all(&item[off..])?;"},{"Add":" }"},{"Add":" Ok(conflicts as u64)"}]}}],"owner":"irevoire","repo":"pijul","token":"QOidrVpukt7E2dS+q8D6AApG9zHOyTnfR2OsqRZsHTg=","login":null}

…

Dependencies

Change contents