{"header":{"message":"Fix in output","description":"If many components are changed simultaneously (in the same patch) along a file path, moving them is confusing, especially since swaps (a → b and b → a in the same patch) must be handled properly.\n\nThis fix takes care of this by introducing a map to remember which files were moved to a temporary location, and using that map instead of `fs::inode_filename` to get the temporary path instead of the actual one.","timestamp":"2023-06-19T09:12:08.771174386Z","authors":[{}]},"hash":"C5MZXLVCVS6JVFYUASM4YH7KCC75D2BH3ARTJ5WCRAVEDQIQSSEQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["C5MZXLVCVS6JVFYUASM4YH7KCC75D2BH3ARTJ5WCRAVEDQIQSSEQC","Fix in output"],["AA",null],["3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC","More detailed display of conflicts"],["PEUUYRZ5MHYM2IQTN3ASXPIFZSK5KI32LIHWM6RIWVRRXIQ5GTNQC","Order of removing paths when outputting a repo"],["GJZWSXHQ6SYUDTVDOUBTJYU3SG567M2AXWURWKRNVP2MISZ444DQC","Do not remove files not tracked in the new channel when outputting"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC","Avoid printing multiple names conflicts more than once"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["H6JR7IAF5LHUDBRAQWAQLLNZR2ONBIXS5FJATAYCMJS7SYADCQLAC","Fixing a panic when outputting zombie folders"],["YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","Moving to temporary paths when outputting"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["4RQHY7LHPHKUWAUQEXFRHKK37RAEFR3RC2QOSUTFTGZRFVWJIVXQC","Support parsing lowercase base32"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","Adding a root inode (aka supporting submodules)"],["UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","Upgrading to the latest Sanakirja/Rand"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","Do not output unmodified files when resetting (fix)"]],"deps":["3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC","PEUUYRZ5MHYM2IQTN3ASXPIFZSK5KI32LIHWM6RIWVRRXIQ5GTNQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","GJZWSXHQ6SYUDTVDOUBTJYU3SG567M2AXWURWKRNVP2MISZ444DQC","H6JR7IAF5LHUDBRAQWAQLLNZR2ONBIXS5FJATAYCMJS7SYADCQLAC","RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","4RQHY7LHPHKUWAUQEXFRHKK37RAEFR3RC2QOSUTFTGZRFVWJIVXQC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":7,"ins":{"up_context":[{"change":4,"pos":672103}],"down_context":[{"change":4,"pos":672154}],"flag":"BLOCK","start":0,"end":33,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":672103},"to":{"change":4,"start":672103,"end":672154},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":"use crate::fs::create_new_inode;"}],"del_contents":[{"Del":"use crate::fs::{create_new_inode, inode_filename};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":258,"ins":{"up_context":[{"change":4,"pos":13191}],"down_context":[{"change":4,"pos":263}],"flag":"BLOCK","start":34,"end":68,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":13191},"to":{"change":2,"start":3405,"end":3406},"introduced_by":2}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" move_map: HashMap::new(),"}],"del_contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":321,"ins":{"up_context":[{"change":4,"pos":471}],"down_context":[{"change":4,"pos":14158}],"flag":"BLOCK","start":69,"end":286,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":471},"to":{"change":4,"start":14112,"end":14158},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":14112},"to":{"change":4,"start":14112,"end":14158},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" // Since we did a depth-first search of the output paths, we need"},{"Add":" // to move in reverse order of the search."},{"Add":" for (a, b) in state.actual_moves.iter().rev() {"},{"Add":" debug!(\"actual move: {:?} {:?}\", a, b);"}],"del_contents":[{"Del":" for (a, b) in state.actual_moves.iter() {\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":366,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":14836}],"down_context":[{"change":4,"pos":14836}],"flag":"BLOCK","start":287,"end":325,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" move_map: HashMap,"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":398,"ins":{"up_context":[{"change":4,"pos":15961}],"down_context":[{"change":4,"pos":16049}],"flag":"BLOCK","start":326,"end":560,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":15961},"to":{"change":4,"start":25563,"end":25662},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" collect_dead_files::<_, R, P>("},{"Add":" &*txn_,"},{"Add":" graph,"},{"Add":" &self.move_map,"},{"Add":" self.pending_change_id,"},{"Add":" Inode::ROOT,"},{"Add":" )?"}],"del_contents":[{"Del":" collect_dead_files::<_, R, P>(&*txn_, graph, self.pending_change_id, Inode::ROOT)?\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":529,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":20289}],"down_context":[{"change":4,"pos":20289}],"flag":"BLOCK","start":561,"end":597,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" &mut self.move_map,"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":555,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":20967}],"down_context":[{"change":4,"pos":20967}],"flag":"BLOCK","start":598,"end":653,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" debug!(\"next_files {:?}\", next_files);"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":617,"atom":{"NewVertex":{"up_context":[{"change":22,"pos":1501}],"down_context":[{"change":22,"pos":1501}],"flag":"BLOCK","start":654,"end":677,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":""},{"Add":"use std::borrow::Cow;"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":629,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":679880}],"down_context":[{"change":4,"pos":3632}],"flag":"BLOCK","start":678,"end":721,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" move_map: &mut HashMap,"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":643,"ins":{"up_context":[{"change":4,"pos":103023}],"down_context":[{"change":4,"pos":79912}],"flag":"BLOCK","start":722,"end":1181,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":103023},"to":{"change":4,"start":79838,"end":79911},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":79838},"to":{"change":4,"start":79838,"end":79911},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":79911},"to":{"change":4,"start":680438,"end":680552},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":83144},"to":{"change":4,"start":680438,"end":680552},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":680438},"to":{"change":4,"start":680438,"end":680552},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" if let Some(ref current_name) = inode_filename(&*txn_, inode, move_map)? {"},{"Add":" let actual_path = if let Some(tmp) = tmp.take() {"},{"Add":" Cow::Owned(tmp)"},{"Add":" } else {"},{"Add":" Cow::Borrowed(path)"},{"Add":" };"},{"Add":" debug!("},{"Add":" \"current_name = {:?}, path = {:?}, actual_path = {:?}\","},{"Add":" current_name, path, actual_path"},{"Add":" );"},{"Add":" if current_name.as_str() != &actual_path {"}],"del_contents":[{"Del":" if let Some(ref current_name) = inode_filename(&*txn_, inode)? {\n"},{"Del":" debug!(\"current_name = {:?}, path = {:?}\", current_name, path);\n if current_name != path {\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":660,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":680853},"to":{"change":4,"start":680853,"end":680955},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":680955},"to":{"change":4,"start":3648,"end":3649},"introduced_by":4}],"inode":{"change":4,"pos":671807}}},"contents":[{"Del":" let mut tmp_path = path.to_string();\n crate::path::pop(&mut tmp_path);\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":665,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":3959},"to":{"change":4,"start":681168,"end":681222},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":681168},"to":{"change":4,"start":681168,"end":681222},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":681223},"to":{"change":4,"start":21340,"end":21451},"introduced_by":4}],"inode":{"change":4,"pos":671807}}},"contents":[{"Del":" crate::path::push(&mut tmp_path, &s);\n"},{"Del":" repo.rename(¤t_name, &tmp_path)\n .map_err(OutputError::WorkingCopy)?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":667,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1234}],"down_context":[{"change":4,"pos":1234}],"flag":"BLOCK","start":1182,"end":1322,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" // The parent was already moved"},{"Add":" debug!(\"tmp {:?}\", tmp);"},{"Add":" crate::path::pop(tmp);"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":671,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1282},"to":{"change":4,"start":1282,"end":1358},"introduced_by":4}],"inode":{"change":4,"pos":671807}}},"contents":[{"Del":" } else {\n *tmp = Some(tmp_path.clone());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":672,"ins":{"up_context":[{"change":4,"pos":1376}],"down_context":[{"change":4,"pos":681344}],"flag":"BLOCK","start":1323,"end":1822,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":1376},"to":{"change":4,"start":681279,"end":681344},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":21451},"to":{"change":4,"start":681279,"end":681344},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":681279},"to":{"change":4,"start":681279,"end":681344},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":""},{"Add":" let mut tmp_ = actual_path.to_string();"},{"Add":" crate::path::pop(&mut tmp_);"},{"Add":" crate::path::push(&mut tmp_, &s);"},{"Add":""},{"Add":" debug!(\"rename {:?} {:?}\", current_name, tmp_);"},{"Add":" repo.rename(¤t_name, &tmp_)"},{"Add":" .map_err(OutputError::WorkingCopy)?;"},{"Add":""},{"Add":" move_map.insert(inode, tmp_.to_string());"},{"Add":" actual_moves.push((tmp_.to_string(), actual_path.to_string()));"},{"Add":""},{"Add":" *tmp = Some(tmp_);"}],"del_contents":[{"Del":" actual_moves.push((tmp_path, path.to_string()));\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":836,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":84535}],"down_context":[{"change":4,"pos":683937}],"flag":"BLOCK","start":1823,"end":1862,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" move_map: &HashMap,"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":867,"ins":{"up_context":[{"change":4,"pos":685037}],"down_context":[{"change":4,"pos":685124}],"flag":"BLOCK","start":1863,"end":2034,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":685037},"to":{"change":4,"start":121566,"end":121656},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" dead.insert("},{"Add":" id.to_owned(),"},{"Add":" (*inode_, inode_filename(txn, *inode_, move_map)?),"},{"Add":" );"}],"del_contents":[{"Del":" dead.insert(id.to_owned(), (*inode_, inode_filename(txn, *inode_)?));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":893,"ins":{"up_context":[{"change":3,"pos":191}],"down_context":[{"change":3,"pos":228}],"flag":"BLOCK","start":2035,"end":2074,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":191},"to":{"change":3,"start":191,"end":228},"introduced_by":3}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" let cmp = b.1 .1.cmp(&a.1 .1);"}],"del_contents":[{"Del":" let cmp = b.1.1.cmp(&a.1.1);\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":927,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":686178}],"down_context":[{"change":4,"pos":686178}],"flag":"BLOCK","start":2075,"end":3142,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn inode_filename("},{"Add":" txn: &T,"},{"Add":" inode: Inode,"},{"Add":" tmp: &HashMap,"},{"Add":") -> Result, TreeErr> {"},{"Add":" debug!(\"inode_filename {:?}\", inode);"},{"Add":" let mut components = Vec::new();"},{"Add":" let mut current = inode;"},{"Add":" loop {"},{"Add":" if let Some(tmp) = tmp.get(¤t) {"},{"Add":" components.push(SmallString::from_str(tmp));"},{"Add":" break;"},{"Add":" }"},{"Add":" match txn.get_revtree(¤t, None)? {"},{"Add":" Some(v) => {"},{"Add":" components.push(v.basename.to_owned());"},{"Add":" current = v.parent_inode;"},{"Add":" if current == Inode::ROOT {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" None => {"},{"Add":" debug!(\"filename_of_inode: not in tree\");"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let mut path = String::new();"},{"Add":" for c in components.iter().rev() {"},{"Add":" if !path.is_empty() {"},{"Add":" path.push('/')"},{"Add":" }"},{"Add":" path.push_str(c.as_str());"},{"Add":" }"},{"Add":" debug!(\"inode_filename = {:?}\", path);"},{"Add":" Ok(Some(path))"}]}}],"owner":"laumann","repo":"pijul","token":"A5cfTeMZWxtI7mHLPcYyWTXMJaFAq0UO11VrMd/yBTQ=","login":null}

…

Dependencies

Change contents