{"header":{"message":"Partial push and pull (WARNING: breaks the existing protocol)","description":null,"timestamp":"2020-12-19T17:01:38.669590417Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","authors":[],"deps":{"hashes":[["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["AA",null],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","Do not download changes if we already have them"],["FE5ES6Q46FMWYPNNNJLORY377QGDE57LBBDIVWDTC6Z7U4U73NEQC","Stop pushing/pulling if the remote returns an error"],["SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC","unrecord: show list of changes if none were given as arguments"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["AN7IDX26RK33ZXASXLJMD4GTFWHCTHMJ6Y5C4ROCPIH33VUT2EYQC","pijul: added ChangesNotFound error variant"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","Format, versions, README"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","push/pull: fixed \"changes\" arguments"],["VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","channel switch as an alias to reset"],["WLUID7NANDWTN5GOECNEKFTLZF3MUVS7K26YWLYLSGJ56G63NV4QC","Do not block when downloading more than 100 changes over SSH"],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","Pulling more than 100 changes at once"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Fix some mistakes in the docs"],["367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","Forwarding SSH stderr, and progress bar for push"],["QWD7UE766WLJ3JZU7L2UXMV7Q236DSDMH2CCI4M6HIA4QA3QVFAQC","push/pull: rename `channel` option"],["AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","Write help for each argument"],["5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC","Fixing a race condition between progress bars"],["7L32EXDWOT2BWHPC3ZPAE4W6BOGQTTJUYJWTNMLS6INFXZ7GLPNQC","When pulling, treating the pending change as a local change"],["YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","Unrecording changes atomically"],["FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","Forgot to add remote::http"],["PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","Progress bar for upload and apply"],["5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","Hard-unrecord"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"],["BBKV6VMN4EVBCBSAQMTL2TARBBSQEZGRCXMTKYUIDOJ3HZISUP7AC","Fixing push/pull messages, and do not reverse the changes to download/upload"],["M5FK3ABTKBDG6HHW32G7UKRJEJQKD2U7BPXNZ3HVHBKULWVV6CTQC","Complete dependencies when pushing and pulling"]],"deps":["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","X6YFD4WVMUYJCR5IYPJH6UKYVWSA7DKBRVJ6XQFXHOE2TRYUTAHAC","FE5ES6Q46FMWYPNNNJLORY377QGDE57LBBDIVWDTC6Z7U4U73NEQC","SLJ3OHD4F6GJGZ3SV2D7DMR3PXYHPSI64X77KZ3RJ24EGEX6ZNQAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","AN7IDX26RK33ZXASXLJMD4GTFWHCTHMJ6Y5C4ROCPIH33VUT2EYQC","BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","YAJAXIV5VL263Z6FYLKFPROB3MQPRPH22P44GRGRVGEP56HOMBOAC","VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","FBXYP7QM7SG6P2JDJVQPPCRKJE3GVYXNQ5GVV4GRDUNG6Q4ZRDJQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","AEPEFS7O3YT7CRRFYQVJWUXUUSRGJ6K6XZQVK62B6N74UXOIFWYAC","4H2XTVJ2BNXDNHQ3RQTMOG3I4NRGZT7JDLC2GRINS56TIYTYTO4QC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","367UBQ6KNAKUEWG32R4QRJ6H7IE7NAZFOPTC3ZOE4Z6E44RV3ISQC","K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","PCEJFKFXAFGYGHMM4BOBGFV3WRFXEBF2UQYQHLJ7MURRYBKRM3EAC","7L32EXDWOT2BWHPC3ZPAE4W6BOGQTTJUYJWTNMLS6INFXZ7GLPNQC","5DVRL6MFXQOCPOZMYSKBERMRRVUTYRL2SRGRTU2MH4IEOFCDKM3QC","HXEIH4UQ6EX3MAY33JK4WQUE5GUSZ673OX57JKNFXC2N2QLTXKXAC","WLUID7NANDWTN5GOECNEKFTLZF3MUVS7K26YWLYLSGJ56G63NV4QC","QWD7UE766WLJ3JZU7L2UXMV7Q236DSDMH2CCI4M6HIA4QA3QVFAQC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC"]},"hunks":[{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":25380}],"down_context":[{"change":6,"pos":25647}],"flag":"","start":0,"end":31,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":"use std::collections::HashSet;"}]}},{"Edit":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":12,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":156}],"down_context":[{"change":6,"pos":0}],"flag":"","start":32,"end":66,"inode":{"change":6,"pos":25380}}},"contents":[{"Add":"use libpijul::pristine::Position;"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":260,"ins":{"up_context":[{"change":6,"pos":587}],"down_context":[{"change":6,"pos":659}],"flag":"","start":67,"end":135,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":587},"to":{"change":6,"start":587,"end":659},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" sender: tokio::sync::mpsc::Sender>,"}],"del_contents":[{"Del":" sender: tokio::sync::mpsc::Sender>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":477,"ins":{"up_context":[{"change":6,"pos":6208}],"down_context":[{"change":6,"pos":6354}],"flag":"","start":136,"end":220,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6208},"to":{"change":6,"start":6208,"end":6354},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" sender.send(parse_line(l).ok()).await.unwrap_or(())"}],"del_contents":[{"Del":" let (n, h, m) = parse_line(l)?;\n sender.send(Some((n, h, m))).await.unwrap_or(());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":683,"ins":{"up_context":[{"change":6,"pos":42185}],"down_context":[{"change":6,"pos":8399}],"flag":"","start":221,"end":279,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42185},"to":{"change":6,"start":42185,"end":42222},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" ) -> Result>, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":691,"ins":{"up_context":[{"change":6,"pos":42434}],"down_context":[{"change":6,"pos":42481}],"flag":"","start":280,"end":329,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42434},"to":{"change":6,"start":42434,"end":42481},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" write!(command, \" {:?}\", p).unwrap()"}],"del_contents":[{"Del":" write!(command, \" {}\", p).unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":695,"ins":{"up_context":[{"change":6,"pos":42562}],"down_context":[{"change":6,"pos":44262}],"flag":"","start":330,"end":783,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42562},"to":{"change":6,"start":42562,"end":42593},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42593},"to":{"change":6,"start":8555,"end":8669},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" debug!(\"waiting ssh, command: {:?}\", std::str::from_utf8(&command));"},{"Add":" let mut result = HashSet::new();"},{"Add":" while let Some(Some(m)) = receiver.recv().await {"},{"Add":" match m {"},{"Add":" super::ListLine::Change { n, h, m } => {"},{"Add":" txn.put_remote(remote, n, (h, m))?;"},{"Add":" }"},{"Add":" super::ListLine::Position(pos) => {"},{"Add":" result.insert(pos);"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" debug!(\"waiting ssh\");\n"},{"Del":" while let Some(Some((n, h, m))) = receiver.recv().await {\n txn.put_remote(remote, n, (h, m))?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":710,"ins":{"up_context":[{"change":4,"pos":767}],"down_context":[{"change":6,"pos":44313}],"flag":"","start":784,"end":852,"inode":{"change":6,"pos":25380}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":767},"to":{"change":6,"start":44272,"end":44313},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44272},"to":{"change":6,"start":44272,"end":44313},"introduced_by":6}],"inode":{"change":6,"pos":25380}},"ins_contents":[{"Add":" debug!(\"no msg, result = {:?}\", result);"},{"Add":" Ok(result)"}],"del_contents":[{"Del":" debug!(\"no msg\");\n Ok(())\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":52474}],"down_context":[{"change":6,"pos":406}],"flag":"","start":853,"end":884,"inode":{"change":6,"pos":52474}}},"contents":[{"Add":"use std::collections::HashSet;"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":439}],"down_context":[{"change":6,"pos":363}],"flag":"","start":885,"end":903,"inode":{"change":6,"pos":52474}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":168,"ins":{"up_context":[{"change":6,"pos":56804}],"down_context":[{"change":6,"pos":471}],"flag":"","start":904,"end":986,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":56804},"to":{"change":6,"start":1453,"end":1508},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" ) -> Result>, RemoteRef)>, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result>, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":195,"ins":{"up_context":[{"change":6,"pos":57429}],"down_context":[{"change":4,"pos":940}],"flag":"","start":987,"end":1067,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":57429},"to":{"change":6,"start":57429,"end":57497},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" let paths = self.download_changelist(txn, &mut remote, n, path).await?;"}],"del_contents":[{"Del":" self.download_changelist(txn, &mut remote, n, path).await?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":203,"ins":{"up_context":[{"change":4,"pos":1215}],"down_context":[{"change":6,"pos":57516}],"flag":"","start":1068,"end":1102,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":1215},"to":{"change":6,"start":1637,"end":1662},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":6,"pos":904},"to":{"change":6,"start":1637,"end":1662},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":57497},"to":{"change":6,"start":1637,"end":1662},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" Ok(Some((paths, remote)))"}],"del_contents":[{"Del":" Ok(Some(remote))\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":373,"ins":{"up_context":[{"change":6,"pos":63715}],"down_context":[{"change":6,"pos":63752}],"flag":"","start":1103,"end":1161,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":63715},"to":{"change":6,"start":63715,"end":63752},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" ) -> Result>, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":377,"ins":{"up_context":[{"change":6,"pos":63964}],"down_context":[{"change":6,"pos":65082}],"flag":"","start":1162,"end":1319,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":63964},"to":{"change":6,"start":63964,"end":64637},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":64637},"to":{"change":6,"start":64637,"end":64787},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":64787},"to":{"change":6,"start":64787,"end":64911},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":64911},"to":{"change":6,"start":64911,"end":65045},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":65045},"to":{"change":6,"start":65045,"end":65068},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":65068},"to":{"change":6,"start":65068,"end":65082},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":65082},"to":{"change":6,"start":2257,"end":2308},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" RemoteRepo::Http(ref h) => h.download_changelist(txn, remote, from, paths).await,"},{"Add":" RemoteRepo::LocalChannel(_) => Ok(HashSet::new()),"}],"del_contents":[{"Del":" RemoteRepo::Http(ref h) => {\n let url = h.url.clone() + \"/\" + DOT_DIR;\n let from_ = from.to_string();\n let mut query = vec![(\"changelist\", &from_), (\"channel\", &h.channel)];\n for p in paths.iter() {\n query.push((\"path\", p));\n }\n let res = h.client.get(&url).query(&query).send().await?;\n if !res.status().is_success() {\n return Err((crate::Error::Http {\n status: res.status(),\n })\n .into());\n }\n let resp = res.bytes().await?;\n"},{"Del":" if let Ok(data) = std::str::from_utf8(&resp) {\n for l in data.lines() {\n if !l.is_empty() {\n"},{"Del":" let (n, h, m) = parse_line(l)?;\n txn.put_remote(remote, n, (h, m))?;\n"},{"Del":" } else {\n break;\n }\n }\n }\n"},{"Del":" Ok(())\n"},{"Del":" }\n"},{"Del":" RemoteRepo::LocalChannel(_) => Ok(()),\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":429,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":187}],"down_context":[{"change":6,"pos":68924}],"flag":"","start":1320,"end":1362,"inode":{"change":6,"pos":52474}}},"contents":[{"Add":" inodes: &HashSet>,"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":431,"ins":{"up_context":[{"change":6,"pos":68948}],"down_context":[{"change":6,"pos":68985}],"flag":"","start":1363,"end":1407,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":68948},"to":{"change":6,"start":68948,"end":68985},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" ) -> Result, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":468,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":735}],"down_context":[{"change":3,"pos":593}],"flag":"","start":1408,"end":1454,"inode":{"change":6,"pos":52474}}},"contents":[{"Add":" let mut to_apply_inodes = Vec::new();"}]}},{"Edit":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":484,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":70391}],"down_context":[{"change":6,"pos":921}],"flag":"","start":1455,"end":2529,"inode":{"change":6,"pos":52474}}},"contents":[{"Add":""},{"Add":" let touches_inodes = inodes.is_empty()"},{"Add":" || {"},{"Add":" debug!(\"inodes = {:?}\", inodes);"},{"Add":" use libpijul::changestore::ChangeStore;"},{"Add":" let changes = repo.changes.get_changes(h)?;"},{"Add":" changes.iter().any(|c| {"},{"Add":" c.iter().any(|c| {"},{"Add":" let inode = c.inode();"},{"Add":" debug!(\"inode = {:?}\", inode);"},{"Add":" if let Some(h) = inode.change {"},{"Add":" inodes.contains(&Position {"},{"Add":" change: h,"},{"Add":" pos: inode.pos,"},{"Add":" })"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" })"},{"Add":" })"},{"Add":" }"},{"Add":" || { inodes.iter().any(|i| i.change == *h) };"},{"Add":""},{"Add":" if touches_inodes {"},{"Add":" to_apply_inodes.push(*h);"},{"Add":" } else {"},{"Add":" continue;"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":534,"ins":{"up_context":[{"change":6,"pos":847}],"down_context":[{"change":6,"pos":70874}],"flag":"","start":2530,"end":2558,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":70859},"to":{"change":6,"start":70859,"end":70874},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" Ok(to_apply_inodes)"}],"del_contents":[{"Del":" Ok(())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":612,"ins":{"up_context":[{"change":6,"pos":74014}],"down_context":[{"change":6,"pos":74109}],"flag":"","start":2559,"end":2664,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":74014},"to":{"change":3,"start":748,"end":819},"introduced_by":3}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" self.pull(repo, txn, channel, &to_unrecord, &HashSet::new(), false)"},{"Add":" .await?;"}],"del_contents":[{"Del":" self.pull(repo, txn, channel, &to_unrecord, false).await?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":633,"ins":{"up_context":[{"change":6,"pos":74687}],"down_context":[{"change":6,"pos":74748}],"flag":"","start":2665,"end":2757,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":74687},"to":{"change":3,"start":820,"end":882},"introduced_by":3}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" self.pull(repo, txn, channel, &to_pull, &HashSet::new(), true)"},{"Add":" .await?;"}],"del_contents":[{"Del":" self.pull(repo, txn, channel, &to_pull, true).await?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":709,"ins":{"up_context":[{"change":6,"pos":78229}],"down_context":[{"change":6,"pos":2883}],"flag":"","start":2758,"end":2802,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78229},"to":{"change":6,"start":2849,"end":2883},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" let (inodes, remote_changes) = self"}],"del_contents":[{"Del":" let remote_changes = self\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":717,"ins":{"up_context":[{"change":6,"pos":78459}],"down_context":[{"change":6,"pos":78599}],"flag":"","start":2803,"end":2909,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78459},"to":{"change":3,"start":883,"end":950},"introduced_by":3}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" self.pull(repo, txn, local_channel, &pullable, &inodes, true)"},{"Add":" .await?;"},{"Add":" Ok(())"}],"del_contents":[{"Del":" self.pull(repo, txn, local_channel, &pullable, true).await\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":723,"ins":{"up_context":[{"change":6,"pos":78608}],"down_context":[{"change":6,"pos":78682}],"flag":"","start":2910,"end":3405,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78608},"to":{"change":6,"start":78608,"end":78682},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":"use libpijul::pristine::{ChangePosition, Position};"},{"Add":"use regex::Regex;"},{"Add":""},{"Add":"lazy_static! {"},{"Add":" static ref CHANGELIST_LINE: Regex ="},{"Add":" Regex::new(r#\"(?P[0-9]+)\\.(?P[A-Za-z0-9]+)\\.(?P[A-Za-z0-9]+)\"#).unwrap();"},{"Add":" static ref PATHS_LINE: Regex ="},{"Add":" Regex::new(r#\"(?P[A-Za-z0-9]+)\\.(?P[0-9]+)\"#).unwrap();"},{"Add":"}"},{"Add":""},{"Add":"enum ListLine {"},{"Add":" Change { n: u64, h: Hash, m: Merkle },"},{"Add":" Position(Position),"},{"Add":"}"},{"Add":""},{"Add":"fn parse_line(data: &str) -> Result {"}],"del_contents":[{"Del":"fn parse_line(data: &str) -> Result<(u64, Hash, Merkle), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":740,"ins":{"up_context":[{"change":6,"pos":78715}],"down_context":[{"change":6,"pos":79707}],"flag":"","start":3406,"end":4145,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78715},"to":{"change":6,"start":78715,"end":79707},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" if let Some(caps) = CHANGELIST_LINE.captures(data) {"},{"Add":" if let (Some(h), Some(m)) = ("},{"Add":" Hash::from_base32(caps.name(\"hash\").unwrap().as_str().as_bytes()),"},{"Add":" Merkle::from_base32(caps.name(\"merkle\").unwrap().as_str().as_bytes()),"},{"Add":" ) {"},{"Add":" return Ok(ListLine::Change {"},{"Add":" n: caps.name(\"num\").unwrap().as_str().parse()?,"},{"Add":" h,"},{"Add":" m,"},{"Add":" });"},{"Add":" }"},{"Add":" }"},{"Add":" if let Some(caps) = PATHS_LINE.captures(data) {"},{"Add":" return Ok(ListLine::Position(Position {"},{"Add":" change: Hash::from_base32(caps.name(\"hash\").unwrap().as_str().as_bytes()).unwrap(),"},{"Add":" pos: ChangePosition(caps.name(\"num\").unwrap().as_str().parse().unwrap()),"},{"Add":" }));"}],"del_contents":[{"Del":" let mut it = data.split('.');\n let n = if let Some(n) = it.next().and_then(|n| n.parse().ok()) {\n n\n } else {\n return Err((Error::ProtocolError {\n line: data.as_bytes().to_vec(),\n })\n .into());\n };\n debug!(\"n = {:?}\", n);\n let h = if let Some(h) = it.next().and_then(|h| Hash::from_base32(h.as_bytes())) {\n h\n } else {\n return Err((Error::ProtocolError {\n line: data.as_bytes().to_vec(),\n })\n .into());\n };\n debug!(\"h = {:?}\", h);\n let m = if let Some(m) = it.next().and_then(|m| {\n debug!(\"m = {:?}\", m);\n Merkle::from_base32(m.as_bytes())\n }) {\n m\n } else {\n return Err((Error::ProtocolError {\n line: data.as_bytes().to_vec(),\n })\n .into());\n };\n debug!(\"m = {:?}\", m);\n if it.next().is_some() {\n return Err((Error::ProtocolError {\n line: data.as_bytes().to_vec(),\n })\n .into());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":758,"ins":{"up_context":[{"change":6,"pos":79713}],"down_context":[{"change":6,"pos":79731}],"flag":"","start":4146,"end":4202,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":79713},"to":{"change":6,"start":79713,"end":79731},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" bail!(\"Protocol error, offending line: {:?}\", data)"}],"del_contents":[{"Del":" Ok((n, h, m))\n"}]}},{"Edit":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":79745}],"down_context":[{"change":6,"pos":11563}],"flag":"","start":4203,"end":4234,"inode":{"change":6,"pos":79745}}},"contents":[{"Add":"use std::collections::HashSet;"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":5,"ins":{"up_context":[{"change":6,"pos":535}],"down_context":[{"change":6,"pos":79831}],"flag":"","start":4235,"end":4308,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":535},"to":{"change":6,"start":79768,"end":79831},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":79768},"to":{"change":6,"start":79768,"end":79831},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":"use libpijul::pristine::{Base32, Hash, Merkle, MutTxnT, Position, TxnT};"}],"del_contents":[{"Del":"use libpijul::pristine::{Base32, Hash, Merkle, MutTxnT, TxnT};\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":47,"ins":{"up_context":[{"change":6,"pos":80769}],"down_context":[{"change":6,"pos":80806}],"flag":"","start":4309,"end":4367,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":80769},"to":{"change":6,"start":80769,"end":80806},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" ) -> Result>, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result<(), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":54,"ins":{"up_context":[{"change":6,"pos":81145}],"down_context":[{"change":6,"pos":81172}],"flag":"","start":4368,"end":4407,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":81145},"to":{"change":6,"start":81145,"end":81172},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" return Ok(HashSet::new());"}],"del_contents":[{"Del":" return Ok(());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":56,"ins":{"up_context":[{"change":6,"pos":81183}],"down_context":[{"change":6,"pos":81220}],"flag":"","start":4408,"end":4490,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":81183},"to":{"change":6,"start":81183,"end":81220},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" let mut paths_ = HashSet::new();"},{"Add":" let mut result = HashSet::new();"}],"del_contents":[{"Del":" let mut paths_ = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":60,"ins":{"up_context":[{"change":6,"pos":81346}],"down_context":[{"change":6,"pos":81377}],"flag":"","start":4491,"end":4919,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":81346},"to":{"change":6,"start":81346,"end":81377},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" debug!(\"p = {:?}\", p);"},{"Add":" result.insert(Position {"},{"Add":" change: remote_txn.get_external(p.change).unwrap(),"},{"Add":" pos: p.pos,"},{"Add":" });"},{"Add":" paths_.insert(p);"},{"Add":" paths_.extend(libpijul::fs::iter_graph_descendants("},{"Add":" &remote_txn,"},{"Add":" &remote_channel.borrow(),"},{"Add":" p,"},{"Add":" ));"}],"del_contents":[{"Del":" paths_.push(p)\n"}]}},{"Edit":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":73,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":81401}],"down_context":[{"change":6,"pos":81401}],"flag":"","start":4920,"end":4961,"inode":{"change":6,"pos":79745}}},"contents":[{"Add":" debug!(\"paths_ = {:?}\", paths_);"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":92,"ins":{"up_context":[{"change":6,"pos":82075}],"down_context":[{"change":6,"pos":82090}],"flag":"","start":4962,"end":4981,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":82075},"to":{"change":6,"start":82075,"end":82090},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" Ok(result)"}],"del_contents":[{"Del":" Ok(())\n"}]}},{"Edit":{"inode":{"change":6,"pos":10},"path":"pijul/src/remote/http.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":10}],"down_context":[{"change":6,"pos":11}],"flag":"","start":4982,"end":5013,"inode":{"change":6,"pos":10}}},"contents":[{"Add":"use std::collections::HashSet;"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"pijul/src/remote/http.rs","line":6,"ins":{"up_context":[{"change":6,"pos":1221}],"down_context":[{"change":6,"pos":779}],"flag":"","start":5014,"end":5100,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1221},"to":{"change":6,"start":1221,"end":1253},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":"use libpijul::pristine::{Base32, MutTxnT, Position};"},{"Add":"use libpijul::{Hash, RemoteRef};"}],"del_contents":[{"Del":"use libpijul::pristine::Base32;\n"}]}},{"Edit":{"inode":{"change":6,"pos":10},"path":"pijul/src/remote/http.rs","line":113,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":1380}],"down_context":[{"change":6,"pos":1380}],"flag":"","start":5101,"end":6509,"inode":{"change":6,"pos":10}}},"contents":[{"Add":""},{"Add":" pub async fn download_changelist("},{"Add":" &self,"},{"Add":" txn: &mut T,"},{"Add":" remote: &mut RemoteRef,"},{"Add":" from: u64,"},{"Add":" paths: &[String],"},{"Add":" ) -> Result>, anyhow::Error> {"},{"Add":" let url = self.url.clone() + \"/\" + super::DOT_DIR;"},{"Add":" let from_ = from.to_string();"},{"Add":" let mut query = vec![(\"changelist\", &from_), (\"channel\", &self.channel)];"},{"Add":" for p in paths.iter() {"},{"Add":" query.push((\"path\", p));"},{"Add":" }"},{"Add":" let res = self.client.get(&url).query(&query).send().await?;"},{"Add":" if !res.status().is_success() {"},{"Add":" return Err((crate::Error::Http {"},{"Add":" status: res.status(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" let resp = res.bytes().await?;"},{"Add":" let mut result = HashSet::new();"},{"Add":" if let Ok(data) = std::str::from_utf8(&resp) {"},{"Add":" for l in data.lines() {"},{"Add":" if !l.is_empty() {"},{"Add":" match super::parse_line(l)? {"},{"Add":" super::ListLine::Change { n, m, h } => {"},{"Add":" txn.put_remote(remote, n, (h, m))?;"},{"Add":" }"},{"Add":" super::ListLine::Position(pos) => {"},{"Add":" result.insert(pos);"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(result)"},{"Add":" }"}]}},{"Edit":{"inode":{"change":6,"pos":83981},"path":"pijul/src/main.rs","line":166,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":87334},"to":{"change":6,"start":87334,"end":87413},"introduced_by":6}],"inode":{"change":6,"pos":83981}}},"contents":[{"Del":" #[error(\"Ambiguous path: {:?}\", path)]\n AmbiguousPath { path: String },\n"}]}},{"Edit":{"inode":{"change":6,"pos":83981},"path":"pijul/src/main.rs","line":182,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":88054},"to":{"change":6,"start":0,"end":93},"introduced_by":6}],"inode":{"change":6,"pos":83981}}},"contents":[{"Del":" #[error(\"Changes not found: {:?}\", hashes)]\n ChangesNotFound { hashes: Vec },\n"}]}},{"Edit":{"inode":{"change":6,"pos":97650},"path":"pijul/src/commands/reset.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":100716}],"down_context":[{"change":6,"pos":100907}],"flag":"","start":6510,"end":6559,"inode":{"change":6,"pos":97650}}},"contents":[{"Add":" let now = std::time::Instant::now();"}]}},{"Replacement":{"inode":{"change":6,"pos":97650},"path":"pijul/src/commands/reset.rs","line":122,"ins":{"up_context":[{"change":6,"pos":101687}],"down_context":[{"change":6,"pos":101713}],"flag":"","start":6560,"end":6636,"inode":{"change":6,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":101687},"to":{"change":6,"start":101687,"end":101713},"introduced_by":6}],"inode":{"change":6,"pos":97650}},"ins_contents":[{"Add":" txn.commit()?;"},{"Add":" debug!(\"now = {:?}\", now.elapsed());"}],"del_contents":[{"Del":" txn.commit()?\n"}]}},{"Edit":{"inode":{"change":6,"pos":97650},"path":"pijul/src/commands/reset.rs","line":125,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":101723}],"down_context":[{"change":6,"pos":101723}],"flag":"","start":6637,"end":6848,"inode":{"change":6,"pos":97650}}},"contents":[{"Add":" let locks = libpijul::TIMERS.lock().unwrap();"},{"Add":" debug!("},{"Add":" \"retrieve: {:?}, graph: {:?}, output: {:?}\","},{"Add":" locks.alive_retrieve, locks.alive_graph, locks.alive_output,"},{"Add":" );"}]}},{"Edit":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":6,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":2969}],"down_context":[{"change":6,"pos":1696}],"flag":"","start":6849,"end":6867,"inode":{"change":6,"pos":111631}}},"contents":[{"Add":"use anyhow::bail;"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":73,"ins":{"up_context":[{"change":6,"pos":113407}],"down_context":[{"change":6,"pos":1799}],"flag":"","start":6868,"end":6891,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":113407},"to":{"change":6,"start":113407,"end":113433},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" path: Vec,"}],"del_contents":[{"Del":" path: Option,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":103,"ins":{"up_context":[{"change":6,"pos":250}],"down_context":[{"change":6,"pos":2374}],"flag":"","start":6892,"end":6915,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":250},"to":{"change":6,"start":250,"end":276},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" path: Vec,"}],"del_contents":[{"Del":" path: Option,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":129,"ins":{"up_context":[{"change":6,"pos":114865}],"down_context":[{"change":6,"pos":114925}],"flag":"","start":6916,"end":6953,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":114865},"to":{"change":6,"start":114865,"end":114925},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" bail!(\"Missing remote\");"}],"del_contents":[{"Del":" return Err(crate::Error::MissingRemote.into());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":154,"ins":{"up_context":[{"change":6,"pos":115611}],"down_context":[{"change":6,"pos":115823}],"flag":"","start":6954,"end":7038,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115611},"to":{"change":6,"start":115611,"end":115664},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115664},"to":{"change":6,"start":0,"end":20},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20},"to":{"change":6,"start":115696,"end":115743},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115696},"to":{"change":6,"start":115696,"end":115743},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1778},"to":{"change":6,"start":115743,"end":115823},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115743},"to":{"change":6,"start":115743,"end":115823},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" let remote_changes = remote.update_changelist(&mut txn, &self.path).await?;"}],"del_contents":[{"Del":" let mut paths = if let Some(p) = self.path {\n"},{"Del":" vec![p]\n"},{"Del":" } else {\n vec![]\n };\n"},{"Del":" let remote_changes = remote.update_changelist(&mut txn, &paths).await?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":157,"ins":{"up_context":[{"change":6,"pos":115889}],"down_context":[{"change":6,"pos":116032}],"flag":"","start":7039,"end":7207,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115889},"to":{"change":6,"start":115889,"end":116032},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" let mut paths = HashSet::new();"},{"Add":" for path in self.path.iter() {"},{"Add":" let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, path)?;"}],"del_contents":[{"Del":" let path = if let Some(path) = paths.pop() {\n let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, &path)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":161,"ins":{"up_context":[{"change":6,"pos":116059}],"down_context":[{"change":6,"pos":116148}],"flag":"","start":7208,"end":7260,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":116059},"to":{"change":6,"start":677,"end":752},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" bail!(\"Ambiguous path: {:?}\", path)"}],"del_contents":[{"Del":" return Err((crate::Error::AmbiguousPath { path }).into());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":163,"ins":{"up_context":[{"change":6,"pos":116162}],"down_context":[{"change":6,"pos":116227}],"flag":"","start":7261,"end":7455,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":116162},"to":{"change":6,"start":116162,"end":116227},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" paths.insert(p);"},{"Add":" paths.extend(libpijul::fs::iter_graph_descendants("},{"Add":" &txn,"},{"Add":" &channel.borrow(),"},{"Add":" p,"},{"Add":" ));"},{"Add":" }"}],"del_contents":[{"Del":" Some(p)\n } else {\n None\n };\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":173,"ins":{"up_context":[{"change":6,"pos":116338}],"down_context":[{"change":6,"pos":4561}],"flag":"","start":7456,"end":7524,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":116338},"to":{"change":6,"start":4498,"end":4561},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" if let Some((_, ref remote_changes)) = remote_changes {"}],"del_contents":[{"Del":" if let Some(ref remote_changes) = remote_changes {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":179,"ins":{"up_context":[{"change":6,"pos":4789}],"down_context":[{"change":6,"pos":4961}],"flag":"","start":7525,"end":7888,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4789},"to":{"change":6,"start":4789,"end":4961},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" if paths.is_empty() {"},{"Add":" to_upload.push(h)"},{"Add":" } else {"},{"Add":" for p in paths.iter() {"},{"Add":" if txn.get_touched_files(*p, Some(h_int)).is_some() {"},{"Add":" to_upload.push(h);"},{"Add":" break;"},{"Add":" }"}],"del_contents":[{"Del":" if let Some(ref p) = path {\n if txn.get_touched_files(*p, Some(h_int)).is_some() {\n to_upload.push(h)\n"}]}},{"Edit":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":188,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4987},"to":{"change":6,"start":4987,"end":5016},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5016},"to":{"change":6,"start":116665,"end":116707},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":116665},"to":{"change":6,"start":116665,"end":116707},"introduced_by":6}],"inode":{"change":6,"pos":111631}}},"contents":[{"Del":" } else {\n"},{"Del":" to_upload.push(h)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":195,"ins":{"up_context":[{"change":6,"pos":5404}],"down_context":[{"change":6,"pos":5588}],"flag":"","start":7889,"end":8284,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5404},"to":{"change":6,"start":5404,"end":5588},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" if paths.is_empty() {"},{"Add":" to_upload.push(h)"},{"Add":" } else {"},{"Add":" for p in paths.iter() {"},{"Add":" if txn.get_touched_files(*p, Some(h_int)).is_some() {"},{"Add":" to_upload.push(h);"},{"Add":" break;"},{"Add":" }"}],"del_contents":[{"Del":" if let Some(ref p) = path {\n if txn.get_touched_files(*p, Some(h_int)).is_some() {\n to_upload.push(h)\n"}]}},{"Edit":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":204,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5618},"to":{"change":6,"start":5618,"end":5651},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5651},"to":{"change":6,"start":5651,"end":5697},"introduced_by":6}],"inode":{"change":6,"pos":111631}}},"contents":[{"Del":" } else {\n"},{"Del":" to_upload.push(h)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":236,"ins":{"up_context":[{"change":6,"pos":952}],"down_context":[{"change":6,"pos":1041}],"flag":"","start":8285,"end":8345,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":952},"to":{"change":6,"start":362,"end":452},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" bail!(\"Changes not found: {:?}\", not_found)"}],"del_contents":[{"Del":" return Err((crate::Error::ChangesNotFound { hashes: not_found }).into());\n"}]}},{"Edit":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":245,"atom":{"NewVertex":{"up_context":[{"change":32,"pos":77}],"down_context":[{"change":33,"pos":69}],"flag":"","start":8346,"end":8408,"inode":{"change":6,"pos":111631}}},"contents":[{"Add":" let remote_changes = remote_changes.map(|x| x.1);"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":284,"ins":{"up_context":[{"change":6,"pos":118067}],"down_context":[{"change":6,"pos":118127}],"flag":"","start":8409,"end":8445,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118067},"to":{"change":6,"start":118067,"end":118127},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" bail!(\"Missing remote\")"}],"del_contents":[{"Del":" return Err(crate::Error::MissingRemote.into());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":301,"ins":{"up_context":[{"change":6,"pos":118434}],"down_context":[{"change":6,"pos":118721}],"flag":"","start":8446,"end":8689,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118434},"to":{"change":6,"start":118434,"end":118489},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118489},"to":{"change":6,"start":6122,"end":6203},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6203},"to":{"change":6,"start":118578,"end":118637},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118578},"to":{"change":6,"start":118578,"end":118637},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2097},"to":{"change":6,"start":118637,"end":118721},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118637},"to":{"change":6,"start":118637,"end":118721},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" let mut inodes: HashSet> = HashSet::new();"},{"Add":" let mut to_download = if self.changes.is_empty() {"},{"Add":" let remote_changes = remote.update_changelist(&mut txn, &self.path).await?;"}],"del_contents":[{"Del":" let to_download = if self.changes.is_empty() {\n"},{"Del":" let mut paths = if let Some(p) = self.path {\n vec![p]\n"},{"Del":" } else {\n vec![]\n };\n"},{"Del":" let remote_changes = remote.update_changelist(&mut txn, &paths).await?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":306,"ins":{"up_context":[{"change":6,"pos":118806}],"down_context":[{"change":6,"pos":6267}],"flag":"","start":8690,"end":8812,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118806},"to":{"change":6,"start":6204,"end":6267},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" if let Some((inodes_, remote_changes)) = remote_changes {"},{"Add":" inodes.extend(inodes_.into_iter());"}],"del_contents":[{"Del":" if let Some(ref remote_changes) = remote_changes {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":316,"ins":{"up_context":[{"change":6,"pos":6702}],"down_context":[{"change":6,"pos":6861}],"flag":"","start":8813,"end":9007,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6702},"to":{"change":6,"start":6702,"end":6861},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" let mut inodes_ = HashSet::new();"},{"Add":" for path in self.path.iter() {"},{"Add":" let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, path)?;"}],"del_contents":[{"Del":" let path = if let Some(path) = paths.pop() {\n let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, &path)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":320,"ins":{"up_context":[{"change":6,"pos":6896}],"down_context":[{"change":6,"pos":6993}],"flag":"","start":9008,"end":9068,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6896},"to":{"change":6,"start":753,"end":836},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" bail!(\"Ambiguous path: {:?}\", path)"}],"del_contents":[{"Del":" return Err((crate::Error::AmbiguousPath { path }).into());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":322,"ins":{"up_context":[{"change":6,"pos":7015}],"down_context":[{"change":6,"pos":7112}],"flag":"","start":9069,"end":9525,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7015},"to":{"change":6,"start":7015,"end":7112},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" inodes_.insert(p);"},{"Add":" inodes_.extend(libpijul::fs::iter_graph_descendants("},{"Add":" &txn,"},{"Add":" &channel.borrow(),"},{"Add":" p,"},{"Add":" ));"},{"Add":" }"},{"Add":" inodes.extend(inodes_.iter().map(|x| libpijul::pristine::Position {"},{"Add":" change: txn.get_external(x.change).unwrap(),"},{"Add":" pos: x.pos,"},{"Add":" }));"}],"del_contents":[{"Del":" Some(p)\n } else {\n None\n };\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":344,"ins":{"up_context":[{"change":6,"pos":7709}],"down_context":[{"change":6,"pos":7978}],"flag":"","start":9526,"end":9798,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7709},"to":{"change":6,"start":7709,"end":7978},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" if inodes_.is_empty()"},{"Add":" || inodes_.iter().any(|&inode| {"},{"Add":" txn.get_rev_touched_files(h_int, Some(inode)).is_some()"},{"Add":" })"},{"Add":" {"}],"del_contents":[{"Del":" if let Some(ref p) = path {\n if txn.get_touched_files(*p, Some(h_int)).is_some() {\n to_download.push(h)\n }\n } else {\n"}]}},{"Edit":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":364,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":119431}],"down_context":[{"change":6,"pos":119431}],"flag":"","start":9799,"end":10155,"inode":{"change":6,"pos":111631}}},"contents":[{"Add":" debug!(\"recording\");"},{"Add":" let hash = super::pending(&mut txn, &mut channel, &mut repo)?;"},{"Add":" let to_download = remote"},{"Add":" .pull("},{"Add":" &mut repo,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" &mut to_download,"},{"Add":" &inodes,"},{"Add":" self.all,"},{"Add":" )"},{"Add":" .await?;"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":382,"ins":{"up_context":[{"change":6,"pos":119504}],"down_context":[{"change":6,"pos":120122}],"flag":"","start":10156,"end":10157,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":119504},"to":{"change":6,"start":119504,"end":119533},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":119533},"to":{"change":6,"start":1503,"end":1574},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1574},"to":{"change":6,"start":119907,"end":119922},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":119907},"to":{"change":6,"start":119907,"end":119922},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":119922},"to":{"change":3,"start":951,"end":1028},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1028},"to":{"change":6,"start":120101,"end":120122},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":120101},"to":{"change":6,"start":120101,"end":120122},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" debug!(\"recording\");\n"},{"Del":" let hash = super::pending(&mut txn, &mut channel, &mut repo)?;\n"},{"Del":" remote\n"},{"Del":" .pull(&mut repo, &mut txn, &mut channel, &to_download, self.all)\n"},{"Del":" .await?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":421,"ins":{"up_context":[{"change":6,"pos":2210}],"down_context":[{"change":6,"pos":2211}],"flag":"","start":10158,"end":11136,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":2210},"to":{"change":6,"start":120778,"end":120955},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":120778},"to":{"change":6,"start":120778,"end":120955},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" debug!(\"inodes = {:?}\", inodes);"},{"Add":" if inodes.is_empty() {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" for i in inodes {"},{"Add":" let i = if let Some(change) = txn.get_internal(i.change) {"},{"Add":" libpijul::pristine::Position { change, pos: i.pos }"},{"Add":" } else {"},{"Add":" continue;"},{"Add":" };"},{"Add":" let (path, _) ="},{"Add":" libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?;"},{"Add":" debug!(\"path = {:?}\", path);"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" &path,"},{"Add":" true,"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n \"\",\n true,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":512,"ins":{"up_context":[{"change":6,"pos":123150}],"down_context":[{"change":6,"pos":123223}],"flag":"","start":11137,"end":11190,"inode":{"change":6,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":123150},"to":{"change":6,"start":123150,"end":123223},"introduced_by":6}],"inode":{"change":6,"pos":111631}},"ins_contents":[{"Add":" bail!(\"Missing dependency: {:?}\", n)"}],"del_contents":[{"Del":" return Err((crate::Error::MissingDep { h: *n }).into());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":1,"ins":{"up_context":[{"change":6,"pos":123281}],"down_context":[{"change":6,"pos":1828}],"flag":"","start":11191,"end":11233,"inode":{"change":6,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":123281},"to":{"change":6,"start":1797,"end":1828},"introduced_by":6}],"inode":{"change":6,"pos":123281}},"ins_contents":[{"Add":"use std::collections::{HashMap, HashSet};"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":31,"ins":{"up_context":[{"change":6,"pos":123976}],"down_context":[{"change":6,"pos":124060}],"flag":"","start":11234,"end":11320,"inode":{"change":6,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":123976},"to":{"change":6,"start":123976,"end":124060},"introduced_by":6}],"inode":{"change":6,"pos":123281}},"ins_contents":[{"Add":" static ref CHANGELIST_PATHS: Regex = Regex::new(r#\"\"(((\\\\\")|[^\"])+)\"\"#).unwrap();"}],"del_contents":[{"Del":" static ref CHANGELIST_PATHS: Regex = Regex::new(r#\"\"((\\\\\")|[^\"])+\"\"#).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":97,"ins":{"up_context":[{"change":6,"pos":126705}],"down_context":[{"change":6,"pos":126749}],"flag":"","start":11321,"end":11419,"inode":{"change":6,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":126705},"to":{"change":6,"start":126705,"end":126749},"introduced_by":6}],"inode":{"change":6,"pos":123281}},"ins_contents":[{"Add":" let mut paths = HashSet::new();"},{"Add":" debug!(\"cap[3] = {:?}\", &cap[3]);"}],"del_contents":[{"Del":" let mut paths = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":100,"ins":{"up_context":[{"change":6,"pos":126816}],"down_context":[{"change":6,"pos":126875}],"flag":"","start":11420,"end":11484,"inode":{"change":6,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":126816},"to":{"change":6,"start":126816,"end":126875},"introduced_by":6}],"inode":{"change":6,"pos":123281}},"ins_contents":[{"Add":" let s: String = r[1].replace(\"\\\\\\\"\", \"\\\"\");"}],"del_contents":[{"Del":" let s: String = r[0].parse().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":109,"ins":{"up_context":[{"change":6,"pos":127257}],"down_context":[{"change":6,"pos":127295}],"flag":"","start":11485,"end":11881,"inode":{"change":6,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127257},"to":{"change":6,"start":127257,"end":127295},"introduced_by":6}],"inode":{"change":6,"pos":123281}},"ins_contents":[{"Add":" let h = txn.get_external(p.change).unwrap();"},{"Add":" writeln!(o, \"{}.{}\", h.to_base32(), p.pos.0)?;"},{"Add":" paths.insert(p);"},{"Add":" paths.extend(libpijul::fs::iter_graph_descendants("},{"Add":" &txn,"},{"Add":" &channel.borrow(),"},{"Add":" p,"},{"Add":" ));"}],"del_contents":[{"Del":" paths.push(p)\n"}]}},{"Edit":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":124,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":127543}],"down_context":[{"change":6,"pos":127543}],"flag":"","start":11882,"end":11929,"inode":{"change":6,"pos":123281}}},"contents":[{"Add":" debug!(\"paths = {:?}\", paths);"}]}},{"Replacement":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":128,"ins":{"up_context":[{"change":6,"pos":127715}],"down_context":[{"change":6,"pos":127871}],"flag":"","start":11930,"end":12105,"inode":{"change":6,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127715},"to":{"change":6,"start":127715,"end":127871},"introduced_by":6}],"inode":{"change":6,"pos":123281}},"ins_contents":[{"Add":" || paths.iter().any(|x| {"},{"Add":" x.change == h_int || txn.get_touched_files(*x, Some(h_int)).is_some()"},{"Add":" })"}],"del_contents":[{"Del":" || paths\n .iter()\n .any(|x| txn.get_touched_files(*x, Some(h_int)).is_some())\n"}]}},{"Edit":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1348,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":19236}],"down_context":[{"change":6,"pos":54465}],"flag":"","start":12106,"end":12151,"inode":{"change":6,"pos":586748}}},"contents":[{"Add":" debug!(\"registering change {:?}\", hash);"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1352,"ins":{"up_context":[{"change":6,"pos":54587}],"down_context":[{"change":6,"pos":54658}],"flag":"","start":12152,"end":12187,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":54587},"to":{"change":6,"start":54587,"end":54658},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" debug!(\"dep = {:?}\", dep);"}],"del_contents":[{"Del":" debug!(target:\"libpijul::register_change\", \"dep = {:?}\", dep);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1354,"ins":{"up_context":[{"change":6,"pos":54718}],"down_context":[{"change":6,"pos":54818}],"flag":"","start":12188,"end":12252,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":54718},"to":{"change":6,"start":54718,"end":54818},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" debug!(\"{:?} depends on {:?}\", internal, dep_internal);"}],"del_contents":[{"Del":" debug!(target:\"libpijul::register_change\", \"{:?} depends on {:?}\", internal, dep_internal);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1359,"ins":{"up_context":[{"change":6,"pos":54982}],"down_context":[{"change":6,"pos":55146}],"flag":"","start":12253,"end":12752,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":54982},"to":{"change":6,"start":54982,"end":55146},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" let (inode, pos) = match *hunk {"},{"Add":" Atom::NewVertex(NewVertex {"},{"Add":" ref inode,"},{"Add":" ref flag,"},{"Add":" ref start,"},{"Add":" ref end,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if flag.contains(EdgeFlags::FOLDER) && start == end {"},{"Add":" (inode, Some(*start))"},{"Add":" } else {"},{"Add":" (inode, None)"},{"Add":" }"},{"Add":" }"},{"Add":" Atom::EdgeMap(EdgeMap { ref inode, .. }) => (inode, None),"}],"del_contents":[{"Del":" let inode = match *hunk {\n Atom::NewVertex(NewVertex { ref inode, .. }) => inode,\n Atom::EdgeMap(EdgeMap { ref inode, .. }) => inode,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1382,"ins":{"up_context":[{"change":6,"pos":55376}],"down_context":[{"change":6,"pos":55467}],"flag":"","start":12753,"end":12808,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":55376},"to":{"change":6,"start":55376,"end":55467},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" debug!(\"touched: {:?} {:?}\", inode, internal);"}],"del_contents":[{"Del":" debug!(target:\"libpijul::register_change\", \"touched: {:?} {:?}\", inode, internal);\n"}]}},{"Edit":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1385,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":55569}],"down_context":[{"change":6,"pos":55569}],"flag":"","start":12809,"end":13067,"inode":{"change":6,"pos":586748}}},"contents":[{"Add":" if let Some(pos) = pos {"},{"Add":" let inode = Position {"},{"Add":" change: internal,"},{"Add":" pos,"},{"Add":" };"},{"Add":" txn.put_touched_files(inode, internal)?;"},{"Add":" txn.put_rev_touched_files(internal, inode)?;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":6,"pos":737429},"path":"libpijul/src/fs.rs","line":20,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":738443}],"down_context":[{"change":6,"pos":738461}],"flag":"","start":13068,"end":13099,"inode":{"change":6,"pos":737429}}},"contents":[{"Add":"use std::collections::HashSet;"}]}},{"Edit":{"inode":{"change":6,"pos":737429},"path":"libpijul/src/fs.rs","line":427,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":752107}],"down_context":[{"change":6,"pos":752107}],"flag":"","start":13100,"end":13457,"inode":{"change":6,"pos":737429}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"/// An iterator over the descendants of an"},{"Add":"/// inode key in the graph."},{"Add":"///"},{"Add":"/// Constructed using"},{"Add":"/// [`iter_graph_descendants`](fn.iter_graph_descendants.html)."},{"Add":"pub struct GraphDescendants<'txn, 'channel, T: TxnT> {"},{"Add":" txn: &'txn T,"},{"Add":" channel: &'channel Channel,"},{"Add":" stack: Vec>,"},{"Add":" visited: HashSet>,"}]}},{"Edit":{"inode":{"change":6,"pos":737429},"path":"libpijul/src/fs.rs","line":441,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":752110}],"down_context":[{"change":6,"pos":752165}],"flag":"","start":13458,"end":15365,"inode":{"change":6,"pos":737429}}},"contents":[{"Add":"impl<'txn, 'channel, T: TxnT> Iterator for GraphDescendants<'txn, 'channel, T> {"},{"Add":" type Item = Position;"},{"Add":" fn next(&mut self) -> Option {"},{"Add":" if let Some(mut adj) = self.stack.pop() {"},{"Add":" if let Some(child) = adj.next() {"},{"Add":" self.stack.push(adj);"},{"Add":" let dest = find_block(self.txn, &self.channel, child.dest).unwrap();"},{"Add":" let grandchild = iter_adjacent("},{"Add":" self.txn,"},{"Add":" &self.channel,"},{"Add":" dest,"},{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"},{"Add":" )"},{"Add":" .next()"},{"Add":" .unwrap();"},{"Add":""},{"Add":" if self.visited.insert(grandchild.dest) {"},{"Add":" self.stack.push(iter_adjacent("},{"Add":" self.txn,"},{"Add":" &self.channel,"},{"Add":" grandchild.dest.inode_vertex(),"},{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"},{"Add":" ))"},{"Add":" }"},{"Add":" return Some(grandchild.dest);"},{"Add":" } else {"},{"Add":" // No child left, actually pop."},{"Add":" }"},{"Add":" }"},{"Add":" None"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Returns a list of files under the given key. The root key is"},{"Add":"/// [`pristine::Vertex::ROOT`](../pristine/constant.Vertex::ROOT.html)."},{"Add":"pub fn iter_graph_descendants<'txn, 'channel, T: TxnT>("},{"Add":" txn: &'txn T,"},{"Add":" channel: &'channel Channel,"},{"Add":" key: Position,"},{"Add":") -> GraphDescendants<'txn, 'channel, T> {"},{"Add":" GraphDescendants {"},{"Add":" stack: vec![iter_adjacent("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" key.inode_vertex(),"},{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"},{"Add":" )],"},{"Add":" visited: HashSet::new(),"},{"Add":" txn,"},{"Add":" channel,"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":6,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":46,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":818827}],"down_context":[{"change":6,"pos":818827}],"flag":"","start":15366,"end":15573,"inode":{"change":6,"pos":817216}}},"contents":[{"Add":" }"},{"Add":" fn get_changes("},{"Add":" &self,"},{"Add":" hash: &Hash,"},{"Add":" ) -> Result, crate::change::Local>>, Self::Error> {"},{"Add":" Ok(self.get_change(hash)?.hashed.changes)"}]}}],"owner":"irevoire","repo":"pijul","token":"disW7ZrkiXlYsLBS4im480zuAjc0Z2FntIMp8BwP5PI=","login":null}

…

Dependencies

Change contents