{"header":{"message":"Allow merging two packages based on regular expressions of their name","description":"One major point of Elpe is to allow the least\nexpressive possible language to alter upstream packages from a\ndistribution.\n\nHowever, there are times where that is necessary: for example, rustc\nfinds the path to stdlib is with a function calling `dlinfo` on\nitself: this returns the library in package libstd-rust (which `rustc`\nis dynamically linked against), whereas the one required is in\nlibstd-rust-dev.\n\nThis is solved by copying everything from libstd-rust to\nlibstd-rust-dev. However, since that can be quite costly in terms of\nspace, we let the user specify custom packages on which it must be\ndone.","timestamp":"2025-06-29T21:00:32.94661621Z","authors":[{}]},"hash":"LIUJQXB752UIHJFF32LKJ7ECUZ2VDIFDDHBLAUVNBRTPDYNCAUYQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["LIUJQXB752UIHJFF32LKJ7ECUZ2VDIFDDHBLAUVNBRTPDYNCAUYQC","Allow merging two packages based on regular expressions of their name"],["AA",null],["5IT7CXFGK6HHEWB3D4T5GDV3FZ7I2U7UKXOVSD7RVYSI3GFGVRTAC","Debugging the dependency resolution (Tarjan's SCC algorithm)"],["R7J4254ZZREVMWXXDUM772GPLZSCZSIJKOLEAI33WUF2CPS3X6WQC","Reorganisation of the frontend"],["SI454P2VFO6Y6RO2NIOH6ZROURP3OTB2BBXH2F36KJT6YML6YBIAC","Documentation and cleanup"],["ODUDDQRY373JMDR6W2BHUWSKEU6TEICQMNZIAIFKJPNUA5UN3C4QC","Adding the OCaml interface"],["UWQB743KR36X6A6JVNK3VH6KMEFUHOUT6ZS2Y2SWIJR55JSF5WQAC","First working shell (with ocaml code)"],["BDEVQIAUBDZLH5NNXJ3HD3WK2ART4V6K2FLHMAQVAQYNXGL4TOIQC","Handle cyclic Ubuntu dependencies"]],"deps":["5IT7CXFGK6HHEWB3D4T5GDV3FZ7I2U7UKXOVSD7RVYSI3GFGVRTAC","R7J4254ZZREVMWXXDUM772GPLZSCZSIJKOLEAI33WUF2CPS3X6WQC"],"known":["UWQB743KR36X6A6JVNK3VH6KMEFUHOUT6ZS2Y2SWIJR55JSF5WQAC","ODUDDQRY373JMDR6W2BHUWSKEU6TEICQMNZIAIFKJPNUA5UN3C4QC","SI454P2VFO6Y6RO2NIOH6ZROURP3OTB2BBXH2F36KJT6YML6YBIAC","BDEVQIAUBDZLH5NNXJ3HD3WK2ART4V6K2FLHMAQVAQYNXGL4TOIQC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":1363},"path":"src/main.rs","line":226,"ins":{"up_context":[{"change":4,"pos":1}],"down_context":[{"change":4,"pos":3465}],"flag":"BLOCK","start":0,"end":380,"inode":{"change":4,"pos":1363}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":1},"to":{"change":4,"start":3392,"end":3465},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3392},"to":{"change":4,"start":3392,"end":3465},"introduced_by":4}],"inode":{"change":4,"pos":1363}},"ins_contents":[{"Add":" let link_extra: Vec<_> = r"},{"Add":" .link_extra"},{"Add":" .into_iter()"},{"Add":" .map(|l| {"},{"Add":" ("},{"Add":" regex::Regex::new(&l.pkg).unwrap(),"},{"Add":" regex::Regex::new(&l.dep).unwrap(),"},{"Add":" )"},{"Add":" })"},{"Add":" .collect();"},{"Add":" let p = download_extract_deps(&index, &self.deb_client, &r.name, &link_extra)"}],"del_contents":[{"Del":" let p = download_extract_deps(&index, &self.deb_client, &r.name)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":10326},"path":"src/lib.rs","line":355,"ins":{"up_context":[{"change":4,"pos":12451}],"down_context":[{"change":4,"pos":12517}],"flag":"BLOCK","start":381,"end":452,"inode":{"change":4,"pos":10326}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":12451},"to":{"change":4,"start":12451,"end":12517},"introduced_by":4}],"inode":{"change":4,"pos":10326}},"ins_contents":[{"Add":" let p = extract::download_extract_deps(&index, self, pkg, &[])"}],"del_contents":[{"Del":" let p = extract::download_extract_deps(&index, self, pkg)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":35,"ins":{"up_context":[{"change":4,"pos":310}],"down_context":[{"change":4,"pos":397}],"flag":"BLOCK","start":453,"end":595,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":310},"to":{"change":4,"start":310,"end":397},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" last_transitive: (usize, usize),"},{"Add":" transitive_deps: Vec>,"},{"Add":" transitive_deps_h: BTreeSet>,"}],"del_contents":[{"Del":" transitive_deps: Vec>,\n transitive_deps_h: BTreeSet>,\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":41,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":502}],"down_context":[{"change":4,"pos":502}],"flag":"BLOCK","start":596,"end":610,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" v: usize,"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":19944}],"down_context":[{"change":4,"pos":17694}],"flag":"BLOCK","start":611,"end":660,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" link_extra: &[(regex::Regex, regex::Regex)],"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":54,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":507},"to":{"change":4,"start":507,"end":613},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":" let mut seen: HashMap<_, (Vec<&str>, usize)> = HashMap::new();\n let mut stack = vec![(pkg, None)];\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":55,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":648}],"down_context":[{"change":4,"pos":648}],"flag":"BLOCK","start":661,"end":861,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""},{"Add":" // We first run a DFS of the dependencies and store them in"},{"Add":" // `vertices` for later."},{"Add":" let mut stack = vec![(pkg, None)];"},{"Add":" let mut seen: HashMap<_, (Vec<&str>, usize)> = HashMap::new();"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":67,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":127}],"down_context":[{"change":4,"pos":948}],"flag":"BLOCK","start":862,"end":902,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" let v_len = vertices.len();"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":82,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1608}],"down_context":[{"change":4,"pos":1608}],"flag":"BLOCK","start":903,"end":944,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" last_transitive: (0, 0),"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":85,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1705}],"down_context":[{"change":4,"pos":1705}],"flag":"BLOCK","start":945,"end":971,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" v: v_len,"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":97,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":2103}],"down_context":[{"change":2,"pos":163}],"flag":"BLOCK","start":972,"end":1029,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" // Turn dependencies into their index in `vertices`."}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":117,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":451}],"down_context":[{"change":4,"pos":2259}],"flag":"BLOCK","start":1030,"end":1174,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""},{"Add":" // Two independent missions in one loop:"},{"Add":" // - Hash the context"},{"Add":" // - Collect the `ld_paths` of each package in the SCC."}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":122,"ins":{"up_context":[{"change":4,"pos":2289}],"down_context":[{"change":2,"pos":452}],"flag":"BLOCK","start":1175,"end":1252,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2289},"to":{"change":4,"start":2289,"end":2883},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":2883},"to":{"change":4,"start":21419,"end":21437},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":18790},"to":{"change":4,"start":21419,"end":21437},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":21419},"to":{"change":4,"start":21419,"end":21437},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":18952},"to":{"change":4,"start":21705,"end":21719},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":21705},"to":{"change":4,"start":21705,"end":21719},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":21719},"to":{"change":4,"start":2884,"end":3089},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" hash_context(&mut vertices, *v, &client.store_path, link_extra);"}],"del_contents":[{"Del":" let mut context_hasher = blake3::Hasher::new();\n context_hasher.update(vertices[*v].pkg.sha256.unwrap().as_bytes());\n for d in vertices[*v].deps.iter() {\n let w = &vertices[*d];\n if w.scc == vertices[*v].scc {\n // If in the same SCC, we can't know anything other than the SHA256.\n context_hasher.update(w.pkg.sha256.unwrap().as_bytes());\n } else {\n context_hasher\n .update(w.final_path.as_ref().unwrap().to_str().unwrap().as_bytes());\n"},{"Del":" }\n"},{"Del":" }\n"},{"Del":" vertices[*v].context_path =\n Some(Arc::new(client.store_path.join(\n data_encoding::HEXLOWER.encode(context_hasher.finalize().as_bytes()),\n )));\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":133,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":3099}],"down_context":[{"change":2,"pos":810}],"flag":"BLOCK","start":1253,"end":1357,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""},{"Add":" // Once we have the ld paths of the entire SCC, add them to"},{"Add":" // each vertex of the SCC."}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":143,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":1050}],"down_context":[{"change":2,"pos":1050}],"flag":"BLOCK","start":1358,"end":1452,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""},{"Add":" // Then, find the libraries in the `ld_paths` of each package"},{"Add":" // of the SCC."}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":147,"ins":{"up_context":[{"change":2,"pos":1080}],"down_context":[{"change":2,"pos":1126}],"flag":"BLOCK","start":1453,"end":1509,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1080},"to":{"change":2,"start":1080,"end":1126},"introduced_by":2}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" let a = vertices[*v].transitive_deps.len();"}],"del_contents":[{"Del":" // Find the libs in this package.\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":149,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":1164}],"down_context":[{"change":2,"pos":1164}],"flag":"BLOCK","start":1510,"end":1594,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" vertices[*v].last_transitive = (a, vertices[*v].transitive_deps.len());"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":152,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":21720}],"down_context":[{"change":4,"pos":3100}],"flag":"BLOCK","start":1595,"end":1659,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" // And finalize each of the component (patch ELFs etc)."}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":154,"ins":{"up_context":[{"change":4,"pos":3130}],"down_context":[{"change":4,"pos":3202}],"flag":"BLOCK","start":1660,"end":1789,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3130},"to":{"change":4,"start":3130,"end":3202},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" span!(Level::DEBUG, \"Finalize\");"},{"Add":" let f = finalize(&mut vertices, client, link_extra, &files, *v).await?;"}],"del_contents":[{"Del":" let f = finalize(&mut vertices, client, &files, *v).await?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":359,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":20959}],"down_context":[{"change":4,"pos":25314}],"flag":"BLOCK","start":1790,"end":2739,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""},{"Add":"fn hash_context("},{"Add":" vertices: &mut [Vertex],"},{"Add":" v: usize,"},{"Add":" store_path: &Path,"},{"Add":" link_extra: &[(regex::Regex, regex::Regex)],"},{"Add":") {"},{"Add":" let mut context_hasher = blake3::Hasher::new();"},{"Add":" context_hasher.update(vertices[v].pkg.sha256.unwrap().as_bytes());"},{"Add":" for d in vertices[v].deps.iter() {"},{"Add":" let w = &vertices[*d];"},{"Add":" if w.scc == vertices[v].scc {"},{"Add":" // If in the same SCC, we can't know anything other than the SHA256."},{"Add":" context_hasher.update(w.pkg.sha256.unwrap().as_bytes());"},{"Add":" } else {"},{"Add":" context_hasher.update(w.final_path.as_ref().unwrap().to_str().unwrap().as_bytes());"},{"Add":" }"},{"Add":" }"},{"Add":" for (a, b) in link_extra {"},{"Add":" context_hasher.update(a.to_string().as_bytes());"},{"Add":" context_hasher.update(b.to_string().as_bytes());"},{"Add":" }"},{"Add":" vertices[v].context_path = Some(Arc::new("},{"Add":" store_path.join(data_encoding::HEXLOWER.encode(context_hasher.finalize().as_bytes())),"},{"Add":" ));"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":390,"ins":{"up_context":[{"change":4,"pos":21181}],"down_context":[{"change":4,"pos":21274}],"flag":"BLOCK","start":2740,"end":2894,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":21181},"to":{"change":4,"start":21181,"end":21274},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" async fn link_extra + std::fmt::Debug>("},{"Add":" &mut self,"},{"Add":" final_path: &Path,"},{"Add":" extra: &[S],"},{"Add":" ) -> Result<(), Error> {"}],"del_contents":[{"Del":" async fn link_extra(&mut self, final_path: &Path, extra: &[&str]) -> Result<(), Error> {\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":397,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":21373}],"down_context":[{"change":4,"pos":21373}],"flag":"BLOCK","start":2895,"end":2933,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" let path = path.as_ref();"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":463,"ins":{"up_context":[{"change":4,"pos":27399}],"down_context":[{"change":4,"pos":23105}],"flag":"BLOCK","start":2934,"end":3026,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":27399},"to":{"change":4,"start":7195,"end":7419},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" let path = Arc::new((self.v, ld.strip_prefix(\"/\").unwrap().to_path_buf()));"}],"del_contents":[{"Del":" let path = Arc::new(\n self.context_path\n .as_ref()\n .unwrap()\n .join(ld.strip_prefix(\"/\").unwrap()),\n );\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":471,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":27622}],"down_context":[{"change":4,"pos":27622}],"flag":"BLOCK","start":3027,"end":3029,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":"}"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":473,"ins":{"up_context":[{"change":4,"pos":27623}],"down_context":[{"change":4,"pos":27899}],"flag":"BLOCK","start":3030,"end":3339,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":27623},"to":{"change":4,"start":23224,"end":23365},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":23365},"to":{"change":4,"start":27719,"end":27899},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":27719},"to":{"change":4,"start":27719,"end":27899},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":"async fn patch_elf<'a>("},{"Add":" vertices: &mut [Vertex<'a>],"},{"Add":" v: usize,"},{"Add":" f: &Path,"},{"Add":" dest_path: &Path,"},{"Add":" files: &Files,"},{"Add":") -> Result {"},{"Add":" use elfedit::*;"},{"Add":" info!(\"patch_elf {:?}\", f);"},{"Add":" let file = std::fs::OpenOptions::new()"},{"Add":" .read(true)"},{"Add":" .write(true)"},{"Add":" .open(&f)?;"}],"del_contents":[{"Del":" async fn patch_elf(\n &mut self,\n f: &Path,\n dest_path: &Path,\n files: &Files,\n ) -> Result {\n"},{"Del":" use elfedit::*;\n info!(\"patch_elf {:?}\", f);\n let file = std::fs::OpenOptions::new()\n .read(true)\n .write(true)\n .open(&f)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":487,"ins":{"up_context":[{"change":4,"pos":27900}],"down_context":[{"change":4,"pos":28122}],"flag":"BLOCK","start":3340,"end":3483,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":27900},"to":{"change":4,"start":23366,"end":23573},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":23573},"to":{"change":4,"start":27980,"end":28122},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":27980},"to":{"change":4,"start":27980,"end":28122},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" let mut elf = match Elf::open(&file) {"},{"Add":" Ok(elf) => elf,"},{"Add":" Err(e) => {"},{"Add":" info!(\"error opening {:?}: {:?}\", file, e);"}],"del_contents":[{"Del":" let mut elf = match Elf::open(&file) {\n Ok(elf) => elf,\n Err(e) => {\n info!(\"error opening {:?}: {:?}\", file, e);\n return Ok(false);\n }\n"},{"Del":" };\n info!(\"patching {:?}\", f);\n let Some(parsed) = elf.parse().unwrap() else {\n info!(\"No dynamic section\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":492,"ins":{"up_context":[{"change":4,"pos":28152}],"down_context":[{"change":4,"pos":28411}],"flag":"BLOCK","start":3484,"end":3955,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":28152},"to":{"change":4,"start":28152,"end":28163},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":28163},"to":{"change":4,"start":23574,"end":23719},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":23719},"to":{"change":4,"start":28222,"end":28411},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":28222},"to":{"change":4,"start":28222,"end":28411},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" }"},{"Add":" };"},{"Add":" info!(\"patching {:?}\", f);"},{"Add":" let Some(parsed) = elf.parse().unwrap() else {"},{"Add":" info!(\"No dynamic section\");"},{"Add":" return Ok(false);"},{"Add":" };"},{"Add":" let needed: Vec<_> = parsed"},{"Add":" .needed()"},{"Add":" .map(|x| x.unwrap().to_str().unwrap().to_string())"},{"Add":" .collect();"},{"Add":" let interp = parsed.interpreter();"},{"Add":" if let Some(interp) = interp.unwrap() {"},{"Add":" let interp = interp.to_str().unwrap();"},{"Add":" let files = files.lock().unwrap();"}],"del_contents":[{"Del":" };\n"},{"Del":" let needed: Vec<_> = parsed\n .needed()\n .map(|x| x.unwrap().to_str().unwrap().to_string())\n .collect();\n"},{"Del":" let interp = parsed.interpreter();\n if let Some(interp) = interp.unwrap() {\n let interp = interp.to_str().unwrap();\n let files = files.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":508,"ins":{"up_context":[{"change":4,"pos":28412}],"down_context":[{"change":4,"pos":28478}],"flag":"BLOCK","start":3956,"end":4018,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":28412},"to":{"change":4,"start":28412,"end":28478},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" let p = Path::new(interp).strip_prefix(\"/\").unwrap();"}],"del_contents":[{"Del":" let p = Path::new(interp).strip_prefix(\"/\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":510,"ins":{"up_context":[{"change":4,"pos":28479}],"down_context":[{"change":4,"pos":29348}],"flag":"BLOCK","start":4019,"end":4526,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":28479},"to":{"change":4,"start":28479,"end":29348},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" let subst = if let Some(subst) = files.get(p) {"},{"Add":" subst.join(p)"},{"Add":" } else if interp.starts_with(\"/usr\")"},{"Add":" || interp.starts_with(\"/lib\")"},{"Add":" || interp.starts_with(\"/bin\")"},{"Add":" {"},{"Add":" // https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/"},{"Add":" let p2 = \"usr\".to_string() + interp;"},{"Add":" let p2 = Path::new(&p2);"},{"Add":" debug!(\"{:?}\", p2);"},{"Add":" if let Some(subst) = files.get(p2) {"},{"Add":" subst.join(p2)"}],"del_contents":[{"Del":" let subst = if let Some(subst) = files.get(p) {\n subst.join(p)\n } else if interp.starts_with(\"/usr\")\n || interp.starts_with(\"/lib\")\n || interp.starts_with(\"/bin\")\n {\n // https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/\n let p2 = \"usr\".to_string() + interp;\n let p2 = Path::new(&p2);\n debug!(\"{:?}\", p2);\n if let Some(subst) = files.get(p2) {\n subst.join(p2)\n } else {\n error!(\"No subst for {:?}\", p2);\n let mut p2 = p2.to_path_buf();\n while p2.pop() {\n debug!(\"p2 = {:?} {:?}\", p2, files.get(&p2));\n }\n return Ok(false);\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":523,"ins":{"up_context":[{"change":4,"pos":29369}],"down_context":[{"change":4,"pos":29657}],"flag":"BLOCK","start":4527,"end":4740,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29369},"to":{"change":4,"start":29369,"end":29657},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" error!(\"No subst for {:?}\", p2);"},{"Add":" let mut p2 = p2.to_path_buf();"},{"Add":" while p2.pop() {"},{"Add":" debug!(\"p2 = {:?} {:?}\", p2, files.get(&p2));"},{"Add":" }"}],"del_contents":[{"Del":" // TODO: not sure what else to do here, we\n // might want to set the interpreter to a\n // different value (equivalent to \"recompiling\n // everything\" on Nix).\n info!(\"Interpreter is {interp}. Already patched?\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":529,"ins":{"up_context":[{"change":4,"pos":29691}],"down_context":[{"change":4,"pos":29936}],"flag":"BLOCK","start":4741,"end":5040,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29691},"to":{"change":4,"start":29691,"end":29778},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29778},"to":{"change":4,"start":23720,"end":23770},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":23770},"to":{"change":4,"start":29812,"end":29872},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29812},"to":{"change":4,"start":29812,"end":29872},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29872},"to":{"change":4,"start":23771,"end":23809},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":23809},"to":{"change":4,"start":29904,"end":29936},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29904},"to":{"change":4,"start":29904,"end":29936},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" }"},{"Add":" } else {"},{"Add":" // TODO: not sure what else to do here, we"},{"Add":" // might want to set the interpreter to a"},{"Add":" // different value (equivalent to \"recompiling"},{"Add":" // everything\" on Nix)."},{"Add":" info!(\"Interpreter is {interp}. Already patched?\");"}],"del_contents":[{"Del":" };\n let subst = CString::new(subst.to_str().unwrap()).unwrap();\n"},{"Del":" info!(\"set interpreter {:?}\", subst);\n"},{"Del":" elf.set_interpreter(subst.to_bytes_with_nul());\n"},{"Del":" } else if needed.is_empty() {\n"},{"Del":" // No need to patch\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":537,"ins":{"up_context":[{"change":4,"pos":29966}],"down_context":[{"change":2,"pos":2349}],"flag":"BLOCK","start":5041,"end":5316,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29966},"to":{"change":4,"start":29966,"end":30057},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30057},"to":{"change":2,"start":2298,"end":2349},"introduced_by":2}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" };"},{"Add":" let subst = CString::new(subst.to_str().unwrap()).unwrap();"},{"Add":" info!(\"set interpreter {:?}\", subst);"},{"Add":" elf.set_interpreter(subst.to_bytes_with_nul());"},{"Add":" } else if needed.is_empty() {"},{"Add":" // No need to patch"},{"Add":" return Ok(false);"},{"Add":" }"}],"del_contents":[{"Del":" }\n\n let mut deps_h = BTreeSet::new();\n let mut path = String::new();\n"},{"Del":" debug!(\"needed: {:?} -> {:?}\", f, needed);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":546,"ins":{"up_context":[{"change":2,"pos":2350}],"down_context":[{"change":4,"pos":23915}],"flag":"BLOCK","start":5317,"end":5909,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2350},"to":{"change":2,"start":2350,"end":2405},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":2405},"to":{"change":4,"start":23865,"end":23914},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":4,"pos":7552},"to":{"change":4,"start":23865,"end":23914},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":23865},"to":{"change":4,"start":23865,"end":23914},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":23914},"to":{"change":4,"start":30140,"end":30177},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30140},"to":{"change":4,"start":30140,"end":30177},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" let mut deps_h = BTreeSet::new();"},{"Add":" let mut path = String::new();"},{"Add":" debug!(\"needed: {:?} -> {:?}\", f, needed);"},{"Add":" let mut satisfied = HashMap::new();"},{"Add":" // First, prefer local deps."},{"Add":" for ld in vertices[v].ld_path.iter() {"},{"Add":" let mut p = vertices[v]"},{"Add":" .context_path"},{"Add":" .clone()"},{"Add":" .unwrap()"},{"Add":" .join(ld.strip_prefix(\"/\").unwrap());"},{"Add":" let mut at_least_one = false;"},{"Add":" for n in needed.iter() {"},{"Add":" let e = satisfied.entry(n);"},{"Add":" use std::collections::hash_map::Entry;"},{"Add":" if let Entry::Occupied(_) = e {"}],"del_contents":[{"Del":" for dep in self.transitive_deps.iter().rev() {\n"},{"Del":" debug!(\"dep of {:?}: {:?}\", f, dep);\n"},{"Del":" if !deps_h.insert(dep) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":564,"ins":{"up_context":[{"change":4,"pos":23955}],"down_context":[{"change":2,"pos":2552}],"flag":"BLOCK","start":5910,"end":6119,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":23955},"to":{"change":4,"start":23955,"end":24106},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":24106},"to":{"change":2,"start":2406,"end":2552},"introduced_by":2}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":""},{"Add":" p.push(&n);"},{"Add":" debug!(\"trying local path {:?}\", p);"},{"Add":" if tokio::fs::metadata(&p).await.is_ok() {"},{"Add":" if let Entry::Vacant(e) = e {"},{"Add":" e.insert(());"}],"del_contents":[{"Del":" let mut dep = dep.to_path_buf();\n let mut is_needed = false;\n for n in needed.iter() {\n dep.push(&n);\n"},{"Del":" let exists = tokio::fs::metadata(&dep).await.is_ok();\n if exists {\n debug!(\"exists {:?}\", dep);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":571,"ins":{"up_context":[{"change":2,"pos":2570}],"down_context":[{"change":4,"pos":24203}],"flag":"BLOCK","start":6120,"end":6251,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2570},"to":{"change":2,"start":2570,"end":2607},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":2607},"to":{"change":4,"start":24176,"end":24203},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":24176},"to":{"change":4,"start":24176,"end":24203},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" at_least_one = true;"},{"Add":" p.pop();"},{"Add":" break;"},{"Add":" } else {"},{"Add":" p.pop();"}],"del_contents":[{"Del":" is_needed |= exists;\n"},{"Del":" dep.pop();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":577,"ins":{"up_context":[{"change":4,"pos":24217}],"down_context":[{"change":4,"pos":30217}],"flag":"BLOCK","start":6252,"end":6288,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":24217},"to":{"change":4,"start":24217,"end":24245},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":24245},"to":{"change":4,"start":30177,"end":30217},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30177},"to":{"change":4,"start":30177,"end":30217},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" }"},{"Add":" if at_least_one {"}],"del_contents":[{"Del":" if !is_needed {\n"},{"Del":" continue;\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":582,"ins":{"up_context":[{"change":4,"pos":30296}],"down_context":[{"change":4,"pos":30346}],"flag":"BLOCK","start":6289,"end":6336,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30296},"to":{"change":4,"start":30296,"end":30346},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" path.push_str(p.to_str().unwrap())"}],"del_contents":[{"Del":" path.push_str(dep.to_str().unwrap());\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":584,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":30356}],"down_context":[{"change":2,"pos":2608}],"flag":"BLOCK","start":6337,"end":6343,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":586,"ins":{"up_context":[{"change":2,"pos":2609}],"down_context":[{"change":2,"pos":2800}],"flag":"BLOCK","start":6344,"end":6996,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2609},"to":{"change":2,"start":2609,"end":2800},"introduced_by":2}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" for dep_ in vertices[v].transitive_deps.iter().rev() {"},{"Add":" let (dep, dep_path) = dep_.as_ref();"},{"Add":" if !deps_h.insert(dep) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" let mut dep = if vertices[*dep].scc == vertices[v].scc {"},{"Add":" vertices[*dep].context_path.clone().unwrap().join(dep_path)"},{"Add":" } else {"},{"Add":" vertices[*dep].final_path.clone().unwrap().join(dep_path)"},{"Add":" };"},{"Add":" debug!(\"dep of {:?}: {:?}\", f, dep);"},{"Add":" let mut is_needed = false;"},{"Add":" for n in needed.iter() {"},{"Add":" let e = satisfied.entry(n);"},{"Add":" use std::collections::hash_map::Entry;"},{"Add":" if let Entry::Occupied(_) = e {"}],"del_contents":[{"Del":" // Add potential local libs.\n let mut last_added = None;\n for (d, _) in find_files(self.downloaded.path.clone())? {\n if last_added.as_deref() == d.parent() {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":604,"ins":{"up_context":[{"change":2,"pos":2840}],"down_context":[{"change":2,"pos":3611}],"flag":"BLOCK","start":6997,"end":7193,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2840},"to":{"change":2,"start":2840,"end":3611},"introduced_by":2}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" dep.push(&n);"},{"Add":" let exists = tokio::fs::metadata(&dep).await.is_ok();"},{"Add":" if exists {"},{"Add":" if let Entry::Vacant(e) = e {"},{"Add":" e.insert(());"}],"del_contents":[{"Del":" for n in needed.iter() {\n if d.file_name().unwrap().to_str().unwrap() == n {\n last_added = d.parent().map(|x| x.to_path_buf());\n if !path.is_empty() {\n path.push(':')\n }\n let suffix = d\n .parent()\n .unwrap()\n .strip_prefix(&self.downloaded.path)\n .unwrap();\n path.push_str(\n self.context_path\n .as_ref()\n .unwrap()\n .join(suffix)\n .to_str()\n .unwrap(),\n );\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":610,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3629}],"down_context":[{"change":2,"pos":3629}],"flag":"BLOCK","start":7194,"end":7272,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" debug!(\"exists {:?}\", dep);"},{"Add":" is_needed = true;"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":613,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3643}],"down_context":[{"change":2,"pos":3643}],"flag":"BLOCK","start":7273,"end":7352,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" dep.pop();"},{"Add":" }"},{"Add":" if !is_needed {"},{"Add":" continue;"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":618,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3653}],"down_context":[{"change":2,"pos":3653}],"flag":"BLOCK","start":7353,"end":7472,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" if !path.is_empty() {"},{"Add":" path.push(':')"},{"Add":" }"},{"Add":" path.push_str(dep.to_str().unwrap());"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":624,"ins":{"up_context":[{"change":2,"pos":3654}],"down_context":[{"change":4,"pos":30494}],"flag":"BLOCK","start":7473,"end":7684,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":3654},"to":{"change":4,"start":30356,"end":30423},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30356},"to":{"change":4,"start":30356,"end":30423},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30423},"to":{"change":4,"start":24246,"end":24274},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":24274},"to":{"change":4,"start":30447,"end":30494},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30447},"to":{"change":4,"start":30447,"end":30494},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" /*"},{"Add":" // Add potential local libs."},{"Add":" let mut last_added = None;"},{"Add":" for (d, _) in find_files(vertices[v].downloaded.path.clone())? {"},{"Add":" if last_added.as_deref() == d.parent() {"},{"Add":" continue;"}],"del_contents":[{"Del":" path.push('\\0');\n info!(\"Setting path {:?}\", path);\n"},{"Del":" if path.len() > 1 {\n"},{"Del":" elf.set_runpath(&path.as_bytes());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":631,"ins":{"up_context":[{"change":4,"pos":30504}],"down_context":[{"change":4,"pos":30626}],"flag":"BLOCK","start":7685,"end":8443,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30504},"to":{"change":4,"start":30504,"end":30626},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" for n in needed.iter() {"},{"Add":" if d.file_name().unwrap().to_str().unwrap() == n {"},{"Add":" last_added = d.parent().map(|x| x.to_path_buf());"},{"Add":" if !path.is_empty() {"},{"Add":" path.push(':')"},{"Add":" }"},{"Add":" let suffix = d"},{"Add":" .parent()"},{"Add":" .unwrap()"},{"Add":" .strip_prefix(&vertices[v].downloaded.path)"},{"Add":" .unwrap();"},{"Add":" path.push_str("},{"Add":" vertices[v]"},{"Add":" .context_path"},{"Add":" .as_ref()"},{"Add":" .unwrap()"},{"Add":" .join(suffix)"},{"Add":" .to_str()"},{"Add":" .unwrap(),"},{"Add":" );"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":"\n debug!(\"patching into {:?}\", dest_path);\n Ok(elf.update(Some(dest_path)).unwrap()) // map_err(From::from)\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":654,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":30632}],"down_context":[{"change":4,"pos":7553}],"flag":"BLOCK","start":8444,"end":8697,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" */"},{"Add":" path.push('\\0');"},{"Add":" info!(\"Setting path {:?}\", path);"},{"Add":" if path.len() > 1 {"},{"Add":" elf.set_runpath(&path.as_bytes());"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"patching into {:?}\", dest_path);"},{"Add":" Ok(elf.update(Some(dest_path)).unwrap()) // map_err(From::from)"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":668,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":7633}],"down_context":[{"change":4,"pos":7633}],"flag":"BLOCK","start":8698,"end":8747,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" link_extra: &[(regex::Regex, regex::Regex)],"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":683,"ins":{"up_context":[{"change":4,"pos":8224}],"down_context":[{"change":2,"pos":3655}],"flag":"BLOCK","start":8748,"end":8790,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8224},"to":{"change":4,"start":8224,"end":8273},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":""},{"Add":" for dep in vertices[v].deps.iter() {"}],"del_contents":[{"Del":" for dep in vertices[v].deps.clone().iter() {\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":689,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3789}],"down_context":[{"change":4,"pos":8273}],"flag":"BLOCK","start":8791,"end":8997,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""},{"Add":" let direct = if vertices[*dep].scc == vertices[v].scc {"},{"Add":" vertices[*dep].context_path.clone().unwrap()"},{"Add":" } else {"},{"Add":" vertices[*dep].final_path.clone().unwrap()"},{"Add":" };"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":700,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":8425}],"down_context":[{"change":4,"pos":31089}],"flag":"BLOCK","start":8998,"end":9311,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" let l = ld.strip_prefix(\"/\").unwrap();"},{"Add":" if std::fs::metadata(&direct.join(l)).is_ok() {"},{"Add":" let path = Arc::new((*dep, l.to_path_buf()));"},{"Add":" if transitive_deps_h.insert(path.clone()) {"},{"Add":" transitive_deps.push(path);"},{"Add":" }"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":708,"ins":{"up_context":[{"change":4,"pos":31099}],"down_context":[{"change":4,"pos":8426}],"flag":"BLOCK","start":9312,"end":9313,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":31099},"to":{"change":2,"start":3790,"end":3863},"introduced_by":2}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":" debug!(\"transitive {:?}\", vertices[*dep].transitive_deps.len());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":718,"ins":{"up_context":[{"change":4,"pos":8760}],"down_context":[{"change":4,"pos":8827}],"flag":"BLOCK","start":9314,"end":9759,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8760},"to":{"change":4,"start":8760,"end":8827},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":""},{"Add":" debug!("},{"Add":" \"adding direct dep: {:?} {:?} {:?}\","},{"Add":" vertices[*dep].scc, vertices[v].scc, direct"},{"Add":" );"},{"Add":" deps_paths.push(direct)"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"transitive {:#?}\", transitive_deps);"},{"Add":""},{"Add":" // Direct deps should come after transitive ones, in order to be"},{"Add":" // picked up earlier when patching the ELFs."},{"Add":" for dep in vertices[v].deps.iter() {"},{"Add":" let direct = if vertices[*dep].scc == vertices[v].scc {"}],"del_contents":[{"Del":" deps_paths.push(if vertices[*dep].scc == vertices[v].scc {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":735,"ins":{"up_context":[{"change":4,"pos":8956}],"down_context":[{"change":4,"pos":8967}],"flag":"BLOCK","start":9760,"end":10187,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8956},"to":{"change":4,"start":8956,"end":8967},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" };"},{"Add":""},{"Add":" for ld in vertices[*dep].ld_path.iter() {"},{"Add":" let l = ld.strip_prefix(\"/\").unwrap();"},{"Add":" if std::fs::metadata(&direct.join(l)).is_ok() {"},{"Add":" let path = Arc::new((*dep, l.to_path_buf()));"},{"Add":" // Push even if it already exists since we need direct"},{"Add":" // deps to come after indirect ones."},{"Add":" transitive_deps.push(path);"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" })\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":747,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":8973}],"down_context":[{"change":4,"pos":8973}],"flag":"BLOCK","start":10188,"end":10189,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":758,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":31482},"to":{"change":4,"start":9394,"end":9456},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9523},"to":{"change":4,"start":31725,"end":31726},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":31725},"to":{"change":4,"start":31725,"end":31726},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":" let initial_deps_len = vertices[v].transitive_deps.len();\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":769,"ins":{"up_context":[{"change":4,"pos":9874}],"down_context":[{"change":4,"pos":10042}],"flag":"BLOCK","start":10190,"end":10515,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":9874},"to":{"change":4,"start":9874,"end":10042},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" info!("},{"Add":" \"create final path for {dest:?} ({:?})\","},{"Add":" vertices[v].pkg.package"},{"Add":" );"},{"Add":" match create_final_path("},{"Add":" client,"},{"Add":" &files,"},{"Add":" vertices,"},{"Add":" v,"},{"Add":" &dest,"},{"Add":" &base_package_name,"},{"Add":" link_extra,"},{"Add":" )"},{"Add":" .await"}],"del_contents":[{"Del":" info!(\"create final path for {dest:?}\");\n match vertices[v]\n .create_final_path(client, &files, &dest, &base_package_name)\n .await\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":823,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":11311},"to":{"change":4,"start":11311,"end":11587},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":" // Replace prefix for all library deps we've just added,\n // in order to get a Merkle tree.\n for dep in &mut vertices[v].transitive_deps[initial_deps_len..] {\n let end = dep.strip_prefix(&*dest).unwrap();\n *dep = Arc::new(final_path.join(&end));\n }\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":846,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":12379},"to":{"change":4,"start":29808,"end":29809},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29808},"to":{"change":4,"start":29808,"end":29809},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29809},"to":{"change":4,"start":12380,"end":12402},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":12402},"to":{"change":4,"start":29809,"end":29908},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29809},"to":{"change":4,"start":29809,"end":29908},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":29940},"to":{"change":4,"start":29940,"end":30415},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30415},"to":{"change":4,"start":12403,"end":12542},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":12542},"to":{"change":4,"start":30544,"end":30579},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30544},"to":{"change":4,"start":30544,"end":30579},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30579},"to":{"change":4,"start":12543,"end":12613},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":12613},"to":{"change":4,"start":30644,"end":30699},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30644},"to":{"change":4,"start":30644,"end":30699},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":"\n"},{"Del":"impl<'a> Vertex<'a> {\n"},{"Del":" async fn create_final_path(\n &mut self,\n client: &Client,\n files: &Files,\n"},{"Del":" dest: &Path,\n base_package_name: &str,\n ) -> Result {\n // Link the required libexec before hashing.\n let tmp = async_tempfile::TempDir::new_in(dest.parent().unwrap()).await?;\n self.link_extra(&tmp.dir_path(), &[\"usr/libexec\", \"usr/lib/gcc\"])\n .await?;\n\n // Patch the ELFs, now that we have all the deps.\n let mut hashing = Vec::new();\n let mut hashes = Vec::with_capacity(hashing.len());\n"},{"Del":" debug!(\"create_final_path {:?}\", self.downloaded.path);\n for (f, meta) in find_files(self.downloaded.path.to_path_buf())? {\n"},{"Del":" debug!(\"f = {:?}\", f);\n"},{"Del":" let rel = f.strip_prefix(&self.downloaded.path).unwrap();\n"},{"Del":" let dest_path = tmp.dir_path().join(&rel);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":847,"ins":{"up_context":[{"change":4,"pos":30700}],"down_context":[{"change":4,"pos":30831}],"flag":"BLOCK","start":10516,"end":10961,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30700},"to":{"change":4,"start":30700,"end":30831},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":"async fn copy(from: &Path, to: &Path) -> Result<(), std::io::Error> {"},{"Add":" let mut stack = vec![from.to_path_buf()];"},{"Add":" while let Some(elt) = stack.pop() {"},{"Add":" if let Ok(mut dir) = tokio::fs::read_dir(&elt).await {"},{"Add":" let p = elt.strip_prefix(&from).unwrap();"},{"Add":" tokio::fs::create_dir_all(&to.join(&p)).await.unwrap();"},{"Add":" while let Some(e) = dir.next_entry().await.unwrap() {"},{"Add":" stack.push(e.path());"}],"del_contents":[{"Del":" if meta.is_dir() {\n tokio::fs::create_dir_all(dest_path).await.unwrap_or(());\n continue;\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":856,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":30845}],"down_context":[{"change":4,"pos":30845}],"flag":"BLOCK","start":10962,"end":11195,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" } else {"},{"Add":" let p = elt.strip_prefix(&from).unwrap();"},{"Add":" debug!(\"copy {:?} to {:?}\", elt, to.join(&p));"},{"Add":" tokio::fs::hard_link(&elt, &to.join(&p)).await.unwrap_or(());"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":865,"ins":{"up_context":[{"change":4,"pos":30846}],"down_context":[{"change":4,"pos":32085}],"flag":"BLOCK","start":11196,"end":12143,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30846},"to":{"change":4,"start":30846,"end":32085},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":"async fn create_final_path<'a>("},{"Add":" client: &Client,"},{"Add":" files: &Files,"},{"Add":" vertices: &mut [Vertex<'a>],"},{"Add":" v: usize,"},{"Add":" dest: &Path,"},{"Add":" base_package_name: &str,"},{"Add":" link_extra: &[(regex::Regex, regex::Regex)],"},{"Add":") -> Result {"},{"Add":" // Link the required libexec before hashing."},{"Add":" let tmp = async_tempfile::TempDir::new_in(dest.parent().unwrap()).await?;"},{"Add":" vertices[v]"},{"Add":" .link_extra(&tmp.dir_path(), &[\"usr/libexec\", \"usr/lib/gcc\"])"},{"Add":" .await"},{"Add":" .unwrap();"},{"Add":""},{"Add":" for (pkg, dep) in link_extra {"},{"Add":" if pkg.is_match(vertices[v].pkg.package) {"},{"Add":" for d in (0..v).rev() {"},{"Add":" if dep.is_match(vertices[d].pkg.package) {"},{"Add":" debug!("},{"Add":" \"match, copying {:?} to {:?}\","},{"Add":" vertices[d].context_path, vertices[v].context_path"},{"Add":" );"},{"Add":" copy(&vertices[d].context_path.clone().unwrap(), &tmp.dir_path()).await?"}],"del_contents":[{"Del":" if meta.is_symlink() {\n // Relink the file to the subst.\n let target = tokio::fs::read_link(&f).await?;\n debug!(\"relink {:?} -> {:?} {:?}\", f, target, target.is_relative());\n let subst = {\n let l = files.lock().unwrap();\n let target_rel = rel.parent().unwrap().join(&target);\n if let Some(subst) = l.get(&target_rel) {\n Some(subst.join(&target_rel))\n } else {\n None\n }\n };\n if let Some(subst) = subst {\n debug!(\"relink to {:?}\", dest_path);\n tokio::fs::symlink(&subst, &dest_path).await?;\n hashes.push((f, subst.to_str().unwrap().to_string()))\n } else {\n // Leave the symlink untouched\n // tokio::fs::create_dir_all(dest_path.parent().unwrap()).await.unwrap_or(());\n debug!(\"symlink {:?} {:?} {:?}\", target, dest_path, f);\n tokio::fs::symlink(&target, &dest_path).await?;\n hashes.push((f, target.to_str().unwrap().to_string()));\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":891,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":32103},"to":{"change":4,"start":32103,"end":32129},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":" continue;\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":892,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":32143}],"down_context":[{"change":4,"pos":32143}],"flag":"BLOCK","start":12144,"end":12160,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" }"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":895,"ins":{"up_context":[{"change":4,"pos":32144}],"down_context":[{"change":4,"pos":32465}],"flag":"BLOCK","start":12161,"end":12605,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":32144},"to":{"change":4,"start":32144,"end":32465},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" // Patch the ELFs, now that we have all the deps."},{"Add":" let mut hashing = Vec::new();"},{"Add":" let mut hashes = Vec::with_capacity(hashing.len());"},{"Add":" debug!(\"create_final_path {:?}\", vertices[v].downloaded.path);"},{"Add":" for (f, meta) in find_files(vertices[v].downloaded.path.to_path_buf())? {"},{"Add":" debug!(\"f = {:?}\", f);"},{"Add":" let rel = f.strip_prefix(&vertices[v].downloaded.path).unwrap();"},{"Add":" let dest_path = tmp.dir_path().join(&rel);"}],"del_contents":[{"Del":" if !self\n .patch_elf(&f, &dest_path, &files)\n .await\n .unwrap_or(false)\n {\n // Hard link\n debug!(\"hard link {:?} {:?}\", f, dest_path);\n tokio::fs::hard_link(&f, &dest_path).await.unwrap_or(());\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":904,"ins":{"up_context":[{"change":4,"pos":32466}],"down_context":[{"change":4,"pos":33026}],"flag":"BLOCK","start":12606,"end":12725,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":32466},"to":{"change":4,"start":32466,"end":33026},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" if meta.is_dir() {"},{"Add":" tokio::fs::create_dir_all(dest_path).await.unwrap_or(());"},{"Add":" continue;"}],"del_contents":[{"Del":" hashing.push(tokio::spawn(async move {\n // hash + write\n info!(\"hashing {:?}\", f);\n if let Ok(file) = tokio::fs::File::open(&dest_path).await {\n let mut hasher = blake3::Hasher::new();\n hash_reader(file, &mut hasher).await.unwrap();\n let hex = data_encoding::HEXLOWER.encode(hasher.finalize().as_bytes());\n Ok::<_, Error>(Some((f, hex)))\n } else {\n Ok(None)\n }\n }));\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":908,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":33036},"to":{"change":4,"start":33036,"end":33066},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":" info!(\"patched all\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":909,"ins":{"up_context":[{"change":4,"pos":33067}],"down_context":[{"change":4,"pos":33194}],"flag":"BLOCK","start":12726,"end":13873,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":33067},"to":{"change":4,"start":33067,"end":33194},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" if meta.is_symlink() {"},{"Add":" // Relink the file to the subst."},{"Add":" let target = tokio::fs::read_link(&f).await?;"},{"Add":" debug!(\"relink {:?} -> {:?} {:?}\", f, target, target.is_relative());"},{"Add":" let subst = {"},{"Add":" let l = files.lock().unwrap();"},{"Add":" let target_rel = rel.parent().unwrap().join(&target);"},{"Add":" if let Some(subst) = l.get(&target_rel) {"},{"Add":" Some(subst.join(&target_rel))"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" };"},{"Add":" if let Some(subst) = subst {"},{"Add":" debug!(\"relink to {:?}\", dest_path);"},{"Add":" tokio::fs::symlink(&subst, &dest_path).await?;"},{"Add":" hashes.push((f, subst.to_str().unwrap().to_string()))"},{"Add":" } else {"},{"Add":" // Leave the symlink untouched"},{"Add":" // tokio::fs::create_dir_all(dest_path.parent().unwrap()).await.unwrap_or(());"},{"Add":" debug!(\"symlink {:?} {:?} {:?}\", target, dest_path, f);"},{"Add":" tokio::fs::symlink(&target, &dest_path).await?;"},{"Add":" hashes.push((f, target.to_str().unwrap().to_string()));"}],"del_contents":[{"Del":" for h in hashing.into_iter() {\n if let Some(h) = h.await.unwrap().unwrap() {\n hashes.push(h)\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":933,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":33208}],"down_context":[{"change":4,"pos":33208}],"flag":"BLOCK","start":13874,"end":13896,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" continue;"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":935,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":33218},"to":{"change":4,"start":33218,"end":33293},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":" hashes.sort_by(|a, b| a.0.cmp(&b.0));\n info!(\"hashed all\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":936,"ins":{"up_context":[{"change":4,"pos":33294}],"down_context":[{"change":4,"pos":33349}],"flag":"BLOCK","start":13897,"end":14005,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":33294},"to":{"change":4,"start":33294,"end":33349},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" if !patch_elf(vertices, v, &f, &dest_path, &files)"},{"Add":" .await"},{"Add":" .unwrap_or(false)"}],"del_contents":[{"Del":" let mut output_hasher = blake3::Hasher::new();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":940,"ins":{"up_context":[{"change":4,"pos":33359}],"down_context":[{"change":4,"pos":37583}],"flag":"BLOCK","start":14006,"end":14158,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":33359},"to":{"change":4,"start":33359,"end":33566},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":33566},"to":{"change":4,"start":12614,"end":12671},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":12671},"to":{"change":4,"start":33618,"end":33975},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":33618},"to":{"change":4,"start":33618,"end":33975},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":33975},"to":{"change":4,"start":37569,"end":37583},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":37569},"to":{"change":4,"start":37569,"end":37583},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" // Hard link"},{"Add":" debug!(\"hard link {:?} {:?}\", f, dest_path);"},{"Add":" tokio::fs::hard_link(&f, &dest_path).await.unwrap_or(());"}],"del_contents":[{"Del":" let blakesums = tmp.dir_path().join(\"blake3sums\");\n let mut file = tokio::fs::File::create(&blakesums).await?;\n for (path, hash) in hashes {\n let path = path\n"},{"Del":" .strip_prefix(&self.downloaded.path)\n"},{"Del":" .unwrap()\n .to_str()\n .unwrap();\n file.write_all(hash.as_bytes()).await?;\n file.write_all(b\" \").await?;\n file.write_all(path.as_bytes()).await?;\n file.write_all(b\"\\n\").await?;\n writeln!(output_hasher, \"{} {}\", hash, path)?;\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":944,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":37593},"to":{"change":4,"start":33976,"end":34179},"introduced_by":4}],"inode":{"change":4,"pos":19587}}},"contents":[{"Del":" let final_path = client.store_path.join(&format!(\n \"{}-{}\",\n data_encoding::HEXLOWER.encode(output_hasher.finalize().as_bytes()),\n base_package_name,\n ));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":945,"ins":{"up_context":[{"change":4,"pos":34180}],"down_context":[{"change":4,"pos":34467}],"flag":"BLOCK","start":14159,"end":14644,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":34180},"to":{"change":4,"start":34180,"end":34467},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" hashing.push(tokio::spawn(async move {"},{"Add":" // hash + write"},{"Add":" info!(\"hashing {:?}\", f);"},{"Add":" if let Ok(file) = tokio::fs::File::open(&dest_path).await {"},{"Add":" let mut hasher = blake3::Hasher::new();"},{"Add":" hash_reader(file, &mut hasher).await.unwrap();"},{"Add":" let hex = data_encoding::HEXLOWER.encode(hasher.finalize().as_bytes());"},{"Add":" Ok::<_, Error>(Some((f, hex)))"},{"Add":" } else {"},{"Add":" Ok(None)"}],"del_contents":[{"Del":" {\n let transitive = tmp.dir_path().join(\"paths\");\n let mut file = tokio::fs::File::create(&transitive).await?;\n for path in self.files.iter() {\n file.write_all(path.as_bytes()).await?;\n file.write_all(b\"\\n\").await?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":956,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":34481}],"down_context":[{"change":4,"pos":34481}],"flag":"BLOCK","start":14645,"end":14806,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" }));"},{"Add":" }"},{"Add":" info!(\"patched all\");"},{"Add":""},{"Add":" for h in hashing.into_iter() {"},{"Add":" if let Some(h) = h.await.unwrap().unwrap() {"},{"Add":" hashes.push(h)"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":964,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":34491}],"down_context":[{"change":4,"pos":34491}],"flag":"BLOCK","start":14807,"end":14880,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" }"},{"Add":" hashes.sort_by(|a, b| a.0.cmp(&b.0));"},{"Add":" info!(\"hashed all\");"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":968,"ins":{"up_context":[{"change":4,"pos":34492}],"down_context":[{"change":4,"pos":34733}],"flag":"BLOCK","start":14881,"end":15514,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":34492},"to":{"change":4,"start":12672,"end":12813},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":12813},"to":{"change":4,"start":34623,"end":34733},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":34623},"to":{"change":4,"start":34623,"end":34733},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" let mut output_hasher = blake3::Hasher::new();"},{"Add":" {"},{"Add":" let blakesums = tmp.dir_path().join(\"blake3sums\");"},{"Add":" let mut file = tokio::fs::File::create(&blakesums).await?;"},{"Add":" for (path, hash) in hashes {"},{"Add":" let path = path"},{"Add":" .strip_prefix(&vertices[v].downloaded.path)"},{"Add":" .unwrap()"},{"Add":" .to_str()"},{"Add":" .unwrap();"},{"Add":" file.write_all(hash.as_bytes()).await?;"},{"Add":" file.write_all(b\" \").await?;"},{"Add":" file.write_all(path.as_bytes()).await?;"},{"Add":" file.write_all(b\"\\n\").await?;"},{"Add":" writeln!(output_hasher, \"{} {}\", hash, path)?;"}],"del_contents":[{"Del":" for (f, _) in find_dirs(self.downloaded.path.to_path_buf())? {\n let rel = f.strip_prefix(&self.downloaded.path).unwrap();\n"},{"Del":" self.files\n .insert(Arc::new(final_path.join(rel).to_str().unwrap().to_string()));\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":984,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":34743}],"down_context":[{"change":4,"pos":34743}],"flag":"BLOCK","start":15515,"end":15704,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":" }"},{"Add":" let final_path = client.store_path.join(&format!("},{"Add":" \"{}-{}\","},{"Add":" data_encoding::HEXLOWER.encode(output_hasher.finalize().as_bytes()),"},{"Add":" base_package_name,"},{"Add":" ));"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":991,"ins":{"up_context":[{"change":4,"pos":34744}],"down_context":[{"change":4,"pos":34891}],"flag":"BLOCK","start":15705,"end":15991,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":34744},"to":{"change":4,"start":34744,"end":34891},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" {"},{"Add":" let transitive = tmp.dir_path().join(\"paths\");"},{"Add":" let mut file = tokio::fs::File::create(&transitive).await?;"},{"Add":" for path in vertices[v].files.iter() {"},{"Add":" file.write_all(path.as_bytes()).await?;"},{"Add":" file.write_all(b\"\\n\").await?;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" info!(\"rename {:?} to {:?}\", tmp.dir_path(), dest);\n tokio::fs::rename(tmp.dir_path(), dest).await?;\n std::mem::forget(tmp);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":1000,"ins":{"up_context":[{"change":4,"pos":34892}],"down_context":[{"change":4,"pos":37593}],"flag":"BLOCK","start":15992,"end":16261,"inode":{"change":4,"pos":19587}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":34892},"to":{"change":4,"start":34892,"end":34915},"introduced_by":4}],"inode":{"change":4,"pos":19587}},"ins_contents":[{"Add":" for (f, _) in find_dirs(vertices[v].downloaded.path.to_path_buf())? {"},{"Add":" let rel = f.strip_prefix(&vertices[v].downloaded.path).unwrap();"},{"Add":" vertices[v]"},{"Add":" .files"},{"Add":" .insert(Arc::new(final_path.join(rel).to_str().unwrap().to_string()));"}],"del_contents":[{"Del":" Ok(final_path)\n"}]}},{"Edit":{"inode":{"change":4,"pos":19587},"path":"src/extract.rs","line":1006,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":37599}],"down_context":[{"change":4,"pos":37599}],"flag":"BLOCK","start":16262,"end":16426,"inode":{"change":4,"pos":19587}}},"contents":[{"Add":""},{"Add":" info!(\"rename {:?} to {:?}\", tmp.dir_path(), dest);"},{"Add":" tokio::fs::rename(tmp.dir_path(), dest).await.unwrap();"},{"Add":" std::mem::forget(tmp);"},{"Add":""},{"Add":" Ok(final_path)"}]}},{"Edit":{"inode":{"change":4,"pos":55490},"path":"elpe/lib/elpegrpc.proto","line":78,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":55824}],"down_context":[{"change":4,"pos":55824}],"flag":"BLOCK","start":16427,"end":16486,"inode":{"change":4,"pos":55490}}},"contents":[{"Add":"message LinkExtra {"},{"Add":" string pkg = 1;"},{"Add":" string dep = 2;"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":55490},"path":"elpe/lib/elpegrpc.proto","line":86,"ins":{"up_context":[{"change":4,"pos":55903}],"down_context":[{"change":4,"pos":55903}],"flag":"BLOCK","start":16487,"end":16524,"inode":{"change":4,"pos":55490}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":55903},"to":{"change":4,"start":63857,"end":63894},"introduced_by":4}],"inode":{"change":4,"pos":55490}},"ins_contents":[{"Add":" repeated LinkExtra link_extra = 3;"}],"del_contents":[{"Del":" repeated string path_patterns = 3;\n"}]}},{"Edit":{"inode":{"change":3,"pos":445},"path":"elpe/lib/derivation.ml","line":61,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2288}],"down_context":[{"change":3,"pos":2288}],"flag":"BLOCK","start":16525,"end":16587,"inode":{"change":3,"pos":445}}},"contents":[{"Add":""},{"Add":"let link_extra = [ (\"libstd-rust-.*-dev\", \"libstd-rust.*\") ]"}]}},{"Replacement":{"inode":{"change":3,"pos":445},"path":"elpe/lib/derivation.ml","line":65,"ins":{"up_context":[{"change":3,"pos":2334}],"down_context":[{"change":3,"pos":2405}],"flag":"BLOCK","start":16588,"end":16799,"inode":{"change":3,"pos":445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2334},"to":{"change":3,"start":2334,"end":2405},"introduced_by":3}],"inode":{"change":3,"pos":445}},"ins_contents":[{"Add":" let link_extra ="},{"Add":" List.map"},{"Add":" (fun (pkg, dep) -> Elpegrpc.Elpe.LinkExtra.make ~pkg ~dep ())"},{"Add":" link_extra"},{"Add":" in"},{"Add":" let req ="},{"Add":" Elpegrpc.Elpe.UbuntuPackageRequest.make ~index ~name ~link_extra ()"},{"Add":" in"}],"del_contents":[{"Del":" let req = Elpegrpc.Elpe.UbuntuPackageRequest.make ~index ~name () in\n"}]}}],"owner":"pmeunier","repo":"elpe","token":"jyO1S7LSc6AHAdZbfxwd77vu8i9ZCM6ahonBcWgXXxs=","login":null}

…

Dependencies

Change contents