{"header":{"message":"Pushing to, and pulling from the local repository","description":null,"timestamp":"2020-11-17T11:36:17.509252718Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","authors":[],"deps":{"hashes":[["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["AA",null],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["IMCZFTIJ245E3JBOHAY3FMEZCGTL4VNIF26WAKJSZMQXZJ4NK3LAC","Update selection instructions to also mention pushing"],["5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC","push/pull: fixed \"changes\" arguments"]],"deps":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC"],"known":["IMCZFTIJ245E3JBOHAY3FMEZCGTL4VNIF26WAKJSZMQXZJ4NK3LAC","5HF7C67M4DZMYTCIG32XEQQ662AHQMIHTHUK7TAVSO52XLMFBZPAC"]},"hunks":[{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":18,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":52838}],"down_context":[{"change":2,"pos":52838}],"flag":"","start":0,"end":26,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" LocalChannel(String),"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":32,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":53031}],"down_context":[{"change":2,"pos":53031}],"flag":"","start":27,"end":61,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" self_path: Option<&Path>,"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":38,"ins":{"up_context":[{"change":2,"pos":53208}],"down_context":[{"change":2,"pos":53271}],"flag":"","start":62,"end":136,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":53208},"to":{"change":2,"start":53208,"end":53271},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" unknown_remote(self_path, name, channel, no_cert_check).await"}],"del_contents":[{"Del":" unknown_remote(name, channel, no_cert_check).await\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":40,"ins":{"up_context":[{"change":2,"pos":53288}],"down_context":[{"change":2,"pos":53351}],"flag":"","start":137,"end":211,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":53288},"to":{"change":2,"start":53288,"end":53351},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" unknown_remote(self_path, name, channel, no_cert_check).await"}],"del_contents":[{"Del":" unknown_remote(name, channel, no_cert_check).await\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":46,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":53399}],"down_context":[{"change":2,"pos":53399}],"flag":"","start":212,"end":242,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" self_path: Option<&Path>,"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":53,"ins":{"up_context":[{"change":2,"pos":53622}],"down_context":[{"change":2,"pos":53657}],"flag":"","start":243,"end":285,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":53622},"to":{"change":2,"start":53622,"end":53657},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" return Ok(RemoteRepo::Http(Http {"}],"del_contents":[{"Del":" Ok(RemoteRepo::Http(Http {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":60,"ins":{"up_context":[{"change":2,"pos":53907}],"down_context":[{"change":2,"pos":54008}],"flag":"","start":286,"end":394,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":53907},"to":{"change":2,"start":53907,"end":54008},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" }));"},{"Add":" }"},{"Add":" if name.starts_with(\"ssh://\") {"},{"Add":" return if let Some(ssh) = ssh_remote(name) {"}],"del_contents":[{"Del":" }))\n } else if name.starts_with(\"ssh://\") {\n if let Some(ssh) = ssh_remote(name) {\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":71,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":54266}],"down_context":[{"change":2,"pos":54266}],"flag":"","start":395,"end":675,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" };"},{"Add":" }"},{"Add":" if let Ok(root) = std::fs::canonicalize(name) {"},{"Add":" if let Some(path) = self_path {"},{"Add":" let path = std::fs::canonicalize(path)?;"},{"Add":" if path == root {"},{"Add":" return Ok(RemoteRepo::LocalChannel(channel.to_string()));"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":80,"ins":{"up_context":[{"change":2,"pos":54276}],"down_context":[{"change":2,"pos":54346}],"flag":"","start":676,"end":723,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":54276},"to":{"change":2,"start":54276,"end":54346},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":""},{"Add":" let mut dot_dir = root.join(DOT_DIR);"}],"del_contents":[{"Del":" } else {\n let mut dot_dir = Path::new(name).join(DOT_DIR);\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":88,"ins":{"up_context":[{"change":2,"pos":54603}],"down_context":[{"change":2,"pos":54644}],"flag":"","start":724,"end":772,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":54603},"to":{"change":2,"start":54603,"end":54644},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" return Ok(RemoteRepo::Local(Local {"}],"del_contents":[{"Del":" Ok(RemoteRepo::Local(Local {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":94,"ins":{"up_context":[{"change":2,"pos":54838}],"down_context":[{"change":2,"pos":55165}],"flag":"","start":773,"end":790,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":54838},"to":{"change":2,"start":54838,"end":55165},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" }));"}],"del_contents":[{"Del":" }))\n } else if let Some(ssh) = ssh_remote(name) {\n debug!(\"unknown_remote, ssh = {:?}\", ssh);\n Ok(RemoteRepo::Ssh(ssh.connect(name, channel).await?))\n } else {\n Err((Error::RemoteNotFound {\n remote: name.to_string(),\n })\n .into())\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":97,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":55181}],"down_context":[{"change":2,"pos":55181}],"flag":"","start":791,"end":1069,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" if let Some(ssh) = ssh_remote(name) {"},{"Add":" debug!(\"unknown_remote, ssh = {:?}\", ssh);"},{"Add":" Ok(RemoteRepo::Ssh(ssh.connect(name, channel).await?))"},{"Add":" } else {"},{"Add":" Err((Error::RemoteNotFound {"},{"Add":" remote: name.to_string(),"},{"Add":" })"},{"Add":" .into())"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":109,"ins":{"up_context":[{"change":2,"pos":55202}],"down_context":[{"change":2,"pos":55231}],"flag":"","start":1070,"end":1107,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":55202},"to":{"change":2,"start":55202,"end":55231},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" fn name(&self) -> Option<&str> {"}],"del_contents":[{"Del":" fn name(&self) -> &str {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":111,"ins":{"up_context":[{"change":2,"pos":55253}],"down_context":[{"change":2,"pos":55421}],"flag":"","start":1108,"end":1343,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":55253},"to":{"change":2,"start":55253,"end":55421},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" RemoteRepo::Ssh(ref s) => Some(s.name.as_str()),"},{"Add":" RemoteRepo::Local(ref l) => Some(l.name.as_str()),"},{"Add":" RemoteRepo::Http(ref h) => Some(h.name.as_str()),"},{"Add":" RemoteRepo::LocalChannel(_) => None,"}],"del_contents":[{"Del":" RemoteRepo::Ssh(ref s) => s.name.as_str(),\n RemoteRepo::Local(ref l) => l.name.as_str(),\n RemoteRepo::Http(ref h) => h.name.as_str(),\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":143,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":56425}],"down_context":[{"change":2,"pos":56425}],"flag":"","start":1344,"end":1393,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" RemoteRepo::LocalChannel(_) => None,"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":156,"ins":{"up_context":[{"change":2,"pos":56691}],"down_context":[{"change":2,"pos":56739}],"flag":"","start":1394,"end":1452,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":56691},"to":{"change":2,"start":56691,"end":56739},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" pub async fn update_changelist("}],"del_contents":[{"Del":" pub async fn update_changelist(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":160,"ins":{"up_context":[{"change":2,"pos":56804}],"down_context":[{"change":2,"pos":56851}],"flag":"","start":1453,"end":1508,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":56804},"to":{"change":2,"start":56804,"end":56851},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" ) -> Result>, anyhow::Error> {"}],"del_contents":[{"Del":" ) -> Result, anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":162,"ins":{"up_context":[{"change":2,"pos":56888}],"down_context":[{"change":2,"pos":56920}],"flag":"","start":1509,"end":1636,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":56888},"to":{"change":2,"start":56888,"end":56920},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" let name = if let Some(name) = self.name() {"},{"Add":" name"},{"Add":" } else {"},{"Add":" return Ok(None);"},{"Add":" };"}],"del_contents":[{"Del":" let name = self.name();\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":181,"ins":{"up_context":[{"change":2,"pos":57497}],"down_context":[{"change":2,"pos":57516}],"flag":"","start":1637,"end":1662,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":57497},"to":{"change":2,"start":57497,"end":57516},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" Ok(Some(remote))"}],"del_contents":[{"Del":" Ok(remote)\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":184,"ins":{"up_context":[{"change":2,"pos":57523}],"down_context":[{"change":2,"pos":57570}],"flag":"","start":1663,"end":1720,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":57523},"to":{"change":2,"start":57523,"end":57570},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" async fn dichotomy_changelist("}],"del_contents":[{"Del":" async fn dichotomy_changelist(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":196,"ins":{"up_context":[{"change":2,"pos":57913}],"down_context":[{"change":2,"pos":57976}],"flag":"","start":1721,"end":1789,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":57913},"to":{"change":2,"start":57913,"end":57976},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" if let Some((_, s)) = self.get_state(txn, Some(b)).await? {"}],"del_contents":[{"Del":" if let Some((_, s)) = self.get_state(Some(b)).await? {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":208,"ins":{"up_context":[{"change":2,"pos":58438}],"down_context":[{"change":2,"pos":58503}],"flag":"","start":1790,"end":1860,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":58438},"to":{"change":2,"start":58438,"end":58503},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" let remote_state = self.get_state(txn, Some(mid)).await?;"}],"del_contents":[{"Del":" let remote_state = self.get_state(Some(mid)).await?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":229,"ins":{"up_context":[{"change":2,"pos":59045}],"down_context":[{"change":2,"pos":59069}],"flag":"","start":1861,"end":1907,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":59045},"to":{"change":2,"start":59045,"end":59069},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" async fn get_state("}],"del_contents":[{"Del":" async fn get_state(\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":231,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":59088}],"down_context":[{"change":2,"pos":59088}],"flag":"","start":1908,"end":1925,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" txn: &T,"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":268,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":60604}],"down_context":[{"change":2,"pos":60604}],"flag":"","start":1926,"end":2196,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" RemoteRepo::LocalChannel(ref channel) => {"},{"Add":" if let Some(channel) = txn.load_channel(&channel) {"},{"Add":" Ok(local::get_state(txn, &channel, mid))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":341,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":63484}],"down_context":[{"change":2,"pos":63484}],"flag":"","start":2197,"end":2256,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" RemoteRepo::LocalChannel(_) => unreachable!(),"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":383,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":65082}],"down_context":[{"change":2,"pos":65082}],"flag":"","start":2257,"end":2308,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" RemoteRepo::LocalChannel(_) => Ok(()),"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":388,"ins":{"up_context":[{"change":2,"pos":65147}],"down_context":[{"change":2,"pos":65180}],"flag":"","start":2309,"end":2397,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":65147},"to":{"change":2,"start":65147,"end":65180},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" pub async fn upload_changes("}],"del_contents":[{"Del":" pub async fn upload_changes(\n"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":390,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":65199}],"down_context":[{"change":2,"pos":65199}],"flag":"","start":2398,"end":2441,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" repo: &mut W,"},{"Add":" txn: &mut T,"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":422,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":66522}],"down_context":[{"change":2,"pos":66522}],"flag":"","start":2442,"end":2759,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" RemoteRepo::LocalChannel(ref channel) => {"},{"Add":" let mut channel = txn.open_or_create_channel(channel)?;"},{"Add":" let store = libpijul::changestore::filesystem::FileSystem::from_changes(local);"},{"Add":" local::upload_changes(&store, repo, txn, &mut channel, changes)"},{"Add":" }"}]}},{"Edit":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":464,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":68044}],"down_context":[{"change":2,"pos":68044}],"flag":"","start":2760,"end":2806,"inode":{"change":2,"pos":52474}}},"contents":[{"Add":" RemoteRepo::LocalChannel(_) => {}"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":616,"ins":{"up_context":[{"change":2,"pos":73321}],"down_context":[{"change":2,"pos":73353}],"flag":"","start":2807,"end":2848,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":73321},"to":{"change":2,"start":73321,"end":73353},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" let name = self.name().unwrap();"}],"del_contents":[{"Del":" let name = self.name();\n"}]}},{"Replacement":{"inode":{"change":2,"pos":52474},"path":"pijul/src/remote/mod.rs","line":755,"ins":{"up_context":[{"change":2,"pos":78229}],"down_context":[{"change":2,"pos":78300}],"flag":"","start":2849,"end":2988,"inode":{"change":2,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":78229},"to":{"change":2,"start":78229,"end":78300},"introduced_by":2}],"inode":{"change":2,"pos":52474}},"ins_contents":[{"Add":" let remote_changes = self"},{"Add":" .update_changelist(txn, path)"},{"Add":" .await?"},{"Add":" .expect(\"Remote is not self\");"}],"del_contents":[{"Del":" let remote_changes = self.update_changelist(txn, path).await?;\n"}]}},{"Edit":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":80101}],"down_context":[{"change":2,"pos":80101}],"flag":"","start":2989,"end":3353,"inode":{"change":2,"pos":79745}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"pub fn get_state("},{"Add":" txn: &T,"},{"Add":" channel: &libpijul::pristine::ChannelRef,"},{"Add":" mid: Option,"},{"Add":") -> Option<(u64, Merkle)> {"},{"Add":" if let Some(mid) = mid {"},{"Add":" txn.get_changes(&channel, mid).map(|(_, m)| (mid, m))"},{"Add":" } else {"},{"Add":" txn.reverse_log(&channel.borrow(), None)"},{"Add":" .next()"},{"Add":" .map(|(n, (_, m))| (n, m))"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":31,"ins":{"up_context":[{"change":2,"pos":80327}],"down_context":[{"change":2,"pos":80598}],"flag":"","start":3354,"end":3397,"inode":{"change":2,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":80327},"to":{"change":2,"start":80327,"end":80598},"introduced_by":2}],"inode":{"change":2,"pos":79745}},"ins_contents":[{"Add":" Ok(get_state(&txn, &channel, mid))"}],"del_contents":[{"Del":" if let Some(mid) = mid {\n Ok(txn.get_changes(&channel, mid).map(|(_, m)| (mid, m)))\n } else {\n Ok(txn\n .reverse_log(&channel.borrow(), None)\n .next()\n .map(|(n, (_, m))| (n, m)))\n }\n"}]}},{"Edit":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":85,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":82503},"to":{"change":2,"start":82503,"end":82557},"introduced_by":2}],"inode":{"change":2,"pos":79745}}},"contents":[{"Del":" let mut ws = libpijul::ApplyWorkspace::new();\n"}]}},{"Replacement":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":90,"ins":{"up_context":[{"change":2,"pos":82894}],"down_context":[{"change":2,"pos":82954}],"flag":"","start":3398,"end":3543,"inode":{"change":2,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":82894},"to":{"change":2,"start":82894,"end":82954},"introduced_by":2}],"inode":{"change":2,"pos":79745}},"ins_contents":[{"Add":" if std::fs::hard_link(&local, &self.changes_dir).is_err() {"},{"Add":" std::fs::copy(&local, &self.changes_dir)?;"},{"Add":" }"}],"del_contents":[{"Del":" std::fs::hard_link(&local, &self.changes_dir)?;\n"}]}},{"Edit":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":96,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":83149},"to":{"change":2,"start":83149,"end":83218},"introduced_by":2}],"inode":{"change":2,"pos":79745}}},"contents":[{"Del":" txn.apply_change_ws(&store, &mut channel, *c, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":98,"ins":{"up_context":[{"change":2,"pos":83322}],"down_context":[{"change":2,"pos":83408}],"flag":"","start":3544,"end":3621,"inode":{"change":2,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":83322},"to":{"change":2,"start":83322,"end":83408},"introduced_by":2}],"inode":{"change":2,"pos":79745}},"ins_contents":[{"Add":" upload_changes(&store, &mut repo, &mut txn, &mut channel, changes)?;"}],"del_contents":[{"Del":" txn.output_repository_no_pending(&mut repo, &store, &mut channel, \"\", true)?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":110,"ins":{"up_context":[{"change":2,"pos":83755}],"down_context":[{"change":2,"pos":83809}],"flag":"","start":3622,"end":3751,"inode":{"change":2,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":83755},"to":{"change":2,"start":83755,"end":83809},"introduced_by":2}],"inode":{"change":2,"pos":79745}},"ins_contents":[{"Add":" if std::fs::hard_link(&self.changes_dir, path).is_err() {"},{"Add":" std::fs::copy(&self.changes_dir, path)?;"},{"Add":" }"}],"del_contents":[{"Del":" std::fs::hard_link(&self.changes_dir, path)?;\n"}]}},{"Edit":{"inode":{"change":2,"pos":79745},"path":"pijul/src/remote/local.rs","line":119,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":83970}],"down_context":[],"flag":"","start":3752,"end":4265,"inode":{"change":2,"pos":79745}}},"contents":[{"Add":""},{"Add":"pub fn upload_changes<"},{"Add":" T: MutTxnTExt,"},{"Add":" C: libpijul::changestore::ChangeStore,"},{"Add":" W: libpijul::working_copy::WorkingCopy,"},{"Add":">("},{"Add":" store: &C,"},{"Add":" repo: &mut W,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut libpijul::pristine::ChannelRef,"},{"Add":" changes: &[Hash],"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" for c in changes {"},{"Add":" txn.apply_change_ws(store, channel, *c, &mut ws)?;"},{"Add":" }"},{"Add":" txn.output_repository_no_pending(repo, store, channel, \"\", true)?;"},{"Add":" Ok(())"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":102,"ins":{"up_context":[{"change":2,"pos":114511}],"down_context":[{"change":2,"pos":114570}],"flag":"","start":4266,"end":4329,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":114511},"to":{"change":2,"start":114511,"end":114570},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" let mut repo = Repository::find_root(self.repo_path)?;"}],"del_contents":[{"Del":" let repo = Repository::find_root(self.repo_path)?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":127,"ins":{"up_context":[{"change":2,"pos":115467}],"down_context":[{"change":2,"pos":115537}],"flag":"","start":4330,"end":4497,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":115467},"to":{"change":2,"start":115467,"end":115537},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" .remote("},{"Add":" Some(&repo.path),"},{"Add":" &remote_name,"},{"Add":" remote_channel,"},{"Add":" self.no_cert_check,"},{"Add":" )"}],"del_contents":[{"Del":" .remote(&remote_name, remote_channel, self.no_cert_check)\n"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":155,"ins":{"up_context":[{"change":2,"pos":116338}],"down_context":[{"change":2,"pos":116665}],"flag":"","start":4498,"end":5016,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":116338},"to":{"change":2,"start":116338,"end":116665},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" if let Some(ref remote_changes) = remote_changes {"},{"Add":" if txn.remote_has_state(remote_changes, m) {"},{"Add":" break;"},{"Add":" }"},{"Add":" let h_int = txn.get_internal(h).unwrap();"},{"Add":" if !txn.remote_has_change(&remote_changes, h) {"},{"Add":" if let Some(ref p) = path {"},{"Add":" if txn.get_touched_files(*p, Some(h_int)).is_some() {"},{"Add":" to_upload.push(h)"},{"Add":" }"},{"Add":" } else {"}],"del_contents":[{"Del":" if txn.remote_has_state(&remote_changes, m) {\n break;\n }\n let h_int = txn.get_internal(h).unwrap();\n if !txn.remote_has_change(&remote_changes, h) {\n if let Some(ref p) = path {\n if txn.get_touched_files(*p, Some(h_int)).is_some() {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":168,"ins":{"up_context":[{"change":2,"pos":116729}],"down_context":[{"change":2,"pos":116792}],"flag":"","start":5017,"end":5745,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":116729},"to":{"change":2,"start":116729,"end":116792},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" }"},{"Add":" } else if let crate::remote::RemoteRepo::LocalChannel(ref remote_channel) = remote {"},{"Add":" if let Some(channel) = txn.load_channel(remote_channel) {"},{"Add":" let channel = channel.borrow();"},{"Add":" let h_int = txn.get_internal(h).unwrap();"},{"Add":" if txn.get_changeset(&channel.changes, h_int, None).is_none() {"},{"Add":" if let Some(ref p) = path {"},{"Add":" if txn.get_touched_files(*p, Some(h_int)).is_some() {"},{"Add":" to_upload.push(h)"},{"Add":" }"},{"Add":" } else {"},{"Add":" to_upload.push(h)"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" } else {\n to_upload.push(h)\n"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":226,"ins":{"up_context":[{"change":2,"pos":117334}],"down_context":[{"change":2,"pos":117414}],"flag":"","start":5746,"end":5955,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":117334},"to":{"change":2,"start":117334,"end":117414},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" .upload_changes("},{"Add":" &mut repo.working_copy,"},{"Add":" &mut txn,"},{"Add":" repo.changes_dir.clone(),"},{"Add":" push_channel,"},{"Add":" &to_upload,"},{"Add":" )"}],"del_contents":[{"Del":" .upload_changes(repo.changes_dir.clone(), push_channel, &to_upload)\n"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":261,"ins":{"up_context":[{"change":2,"pos":118313}],"down_context":[{"change":2,"pos":118381}],"flag":"","start":5956,"end":6121,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":118313},"to":{"change":2,"start":118313,"end":118381},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" .remote("},{"Add":" Some(&repo.path),"},{"Add":" &remote_name,"},{"Add":" from_channel,"},{"Add":" self.no_cert_check,"},{"Add":" )"}],"del_contents":[{"Del":" .remote(&remote_name, from_channel, self.no_cert_check)\n"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":271,"ins":{"up_context":[{"change":2,"pos":118489}],"down_context":[{"change":2,"pos":118578}],"flag":"","start":6122,"end":6203,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":118489},"to":{"change":2,"start":118489,"end":118578},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" let mut paths = if let Some(p) = self.path {"},{"Add":" vec![p]"}],"del_contents":[{"Del":" let paths = if let Some(p) = self.path {\n vec![p.to_string()]\n"}]}},{"Replacement":{"inode":{"change":2,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":279,"ins":{"up_context":[{"change":2,"pos":118806}],"down_context":[{"change":2,"pos":119084}],"flag":"","start":6204,"end":8108,"inode":{"change":2,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":118806},"to":{"change":2,"start":118806,"end":119084},"introduced_by":2}],"inode":{"change":2,"pos":111631}},"ins_contents":[{"Add":" if let Some(ref remote_changes) = remote_changes {"},{"Add":" for (_, (h, m)) in txn.iter_remote(&remote_changes.borrow().remote, 0) {"},{"Add":" if txn.channel_has_state(&channel, m) {"},{"Add":" break;"},{"Add":" } else if txn.get_revchanges(&channel, h).is_none() {"},{"Add":" to_download.push(h)"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let crate::remote::RemoteRepo::LocalChannel(ref remote_channel) = remote {"},{"Add":" let path = if let Some(path) = paths.pop() {"},{"Add":" let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, &path)?;"},{"Add":" if ambiguous {"},{"Add":" return Err((crate::Error::AmbiguousPath { path: path.clone() }).into());"},{"Add":" }"},{"Add":" Some(p)"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":" if let Some(remote_channel) = txn.load_channel(remote_channel) {"},{"Add":" let remote_channel = remote_channel.borrow();"},{"Add":" for (_, (h, m)) in txn.reverse_log(&remote_channel, None) {"},{"Add":" if txn.channel_has_state(&channel, m) {"},{"Add":" break;"},{"Add":" }"},{"Add":" let h_int = txn.get_internal(h).unwrap();"},{"Add":" if txn"},{"Add":" .get_changeset(&channel.borrow().changes, h_int, None)"},{"Add":" .is_none()"},{"Add":" {"},{"Add":" if let Some(ref p) = path {"},{"Add":" if txn.get_touched_files(*p, Some(h_int)).is_some() {"},{"Add":" to_download.push(h)"},{"Add":" }"},{"Add":" } else {"},{"Add":" to_download.push(h)"},{"Add":" }"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" for (_, (h, m)) in txn.iter_remote(&remote_changes.borrow().remote, 0) {\n if txn.channel_has_state(&channel, m) {\n break;\n } else if txn.get_revchanges(&channel, h).is_none() {\n to_download.push(h)\n"}]}},{"Replacement":{"inode":{"change":2,"pos":182891},"path":"pijul/src/commands/clone.rs","line":31,"ins":{"up_context":[{"change":2,"pos":183896}],"down_context":[{"change":2,"pos":183995}],"flag":"","start":8109,"end":8231,"inode":{"change":2,"pos":182891}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":183896},"to":{"change":2,"start":183896,"end":183995},"introduced_by":2}],"inode":{"change":2,"pos":182891}},"ins_contents":[{"Add":" crate::remote::unknown_remote(None, &self.remote, &self.channel, self.no_cert_check)"},{"Add":" .await?;"}],"del_contents":[{"Del":" crate::remote::unknown_remote(&self.remote, &self.channel, self.no_cert_check).await?;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":191083},"path":"pijul/src/commands/archive.rs","line":27,"ins":{"up_context":[{"change":2,"pos":191803}],"down_context":[{"change":2,"pos":191861}],"flag":"","start":8232,"end":8294,"inode":{"change":2,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":191803},"to":{"change":2,"start":191803,"end":191861},"introduced_by":2}],"inode":{"change":2,"pos":191083}},"ins_contents":[{"Add":" pub async fn run(mut self) -> Result<(), anyhow::Error> {"}],"del_contents":[{"Del":" pub async fn run(self) -> Result<(), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":2,"pos":191083},"path":"pijul/src/commands/archive.rs","line":41,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":192281}],"down_context":[{"change":2,"pos":192281}],"flag":"","start":8295,"end":8317,"inode":{"change":2,"pos":191083}}},"contents":[{"Add":" None,"}]}},{"Replacement":{"inode":{"change":2,"pos":191083},"path":"pijul/src/commands/archive.rs","line":51,"ins":{"up_context":[{"change":2,"pos":192546}],"down_context":[{"change":2,"pos":192710}],"flag":"","start":8318,"end":8976,"inode":{"change":2,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":192546},"to":{"change":2,"start":192546,"end":192710},"introduced_by":2}],"inode":{"change":2,"pos":191083}},"ins_contents":[{"Add":" if let crate::remote::RemoteRepo::LocalChannel(_) = remote {"},{"Add":" if let Some(ref mut path) = self.repo_path {"},{"Add":" path.clear();"},{"Add":" path.push(rem);"},{"Add":" }"},{"Add":" } else {"},{"Add":" let mut p = std::path::Path::new(&self.name).to_path_buf();"},{"Add":" if !self.name.ends_with(\".tar.gz\") {"},{"Add":" p.set_extension(\"tar.gz\");"},{"Add":" }"},{"Add":" let mut f = std::fs::File::create(&p)?;"},{"Add":" remote"},{"Add":" .archive(self.prefix, state.map(|x| (x, &extra[..])), &mut f)"},{"Add":" .await?;"},{"Add":" return Ok(());"}],"del_contents":[{"Del":" let mut p = std::path::Path::new(&self.name).to_path_buf();\n if !self.name.ends_with(\".tar.gz\") {\n p.set_extension(\"tar.gz\");\n"}]}},{"Replacement":{"inode":{"change":2,"pos":191083},"path":"pijul/src/commands/archive.rs","line":67,"ins":{"up_context":[{"change":2,"pos":192724}],"down_context":[{"change":2,"pos":192979}],"flag":"","start":8977,"end":9061,"inode":{"change":2,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":192724},"to":{"change":2,"start":192724,"end":192979},"introduced_by":2}],"inode":{"change":2,"pos":191083}},"ins_contents":[{"Add":" }"},{"Add":" if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {"}],"del_contents":[{"Del":" let mut f = std::fs::File::create(&p)?;\n remote\n .archive(self.prefix, state.map(|x| (x, &extra[..])), &mut f)\n .await?;\n } else if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {\n"}]}}],"owner":"irevoire","repo":"pijul","token":"ouND04aZQtFu5TvtK4Kku8GBTie7qKq2Mj0SFRhtFB8=","login":null}

…

Dependencies

Change contents