{"header":{"message":"Avoid printing multiple names conflicts more than once","description":null,"timestamp":"2021-12-06T11:40:52.97205238Z","authors":[{}]},"hash":"HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC","Avoid printing multiple names conflicts more than once"],["AA",null],["LPM4PBYJFIFZXN3JNEZOKEQ74UXUMURIFY5U4R2CFC6N4XINHL4AC","More precise API for working copy in record and output"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","Adding a root inode (aka supporting submodules)"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"]],"deps":["LPM4PBYJFIFZXN3JNEZOKEQ74UXUMURIFY5U4R2CFC6N4XINHL4AC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":13,"ins":{"up_context":[{"change":3,"pos":73463}],"down_context":[{"change":3,"pos":101615}],"flag":"BLOCK","start":0,"end":51,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":73463},"to":{"change":3,"start":672295,"end":672334},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":672295},"to":{"change":3,"start":672295,"end":672334},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":"use std::collections::{hash_map::Entry, BTreeSet};"}],"del_contents":[{"Del":"use std::collections::hash_map::Entry;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":17,"ins":{"up_context":[{"change":3,"pos":672484}],"down_context":[{"change":3,"pos":672501}],"flag":"BLOCK","start":52,"end":101,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":672484},"to":{"change":3,"start":101636,"end":101668},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":"#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]"}],"del_contents":[{"Del":"#[derive(Debug, PartialEq, Eq)]\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":62,"ins":{"up_context":[{"change":3,"pos":3573}],"down_context":[{"change":3,"pos":73834}],"flag":"BLOCK","start":102,"end":182,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":3573},"to":{"change":3,"start":73759,"end":73834},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73759},"to":{"change":3,"start":73759,"end":73834},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":") -> Result, OutputError>"}],"del_contents":[{"Del":") -> Result, OutputError>\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":151,"ins":{"up_context":[{"change":3,"pos":3604}],"down_context":[{"change":3,"pos":75880}],"flag":"BLOCK","start":183,"end":262,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":3604},"to":{"change":3,"start":75806,"end":75880},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":75806},"to":{"change":3,"start":75806,"end":75880},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":") -> Result, OutputError>"}],"del_contents":[{"Del":") -> Result, OutputError>\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":173,"ins":{"up_context":[{"change":3,"pos":13191}],"down_context":[{"change":3,"pos":13222}],"flag":"BLOCK","start":263,"end":299,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13191},"to":{"change":3,"start":13191,"end":13222},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" conflicts: BTreeSet::new(),"}],"del_contents":[{"Del":" conflicts: Vec::new(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":218,"ins":{"up_context":[{"change":3,"pos":13998}],"down_context":[{"change":3,"pos":14062}],"flag":"BLOCK","start":300,"end":399,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13998},"to":{"change":3,"start":13998,"end":14062},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" for x in t.join().unwrap()?.into_iter() {"},{"Add":" state.conflicts.insert(x);"},{"Add":" }"}],"del_contents":[{"Del":" state.conflicts.extend(t.join().unwrap()?.into_iter());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":222,"ins":{"up_context":[{"change":3,"pos":14068}],"down_context":[{"change":3,"pos":14112}],"flag":"BLOCK","start":400,"end":471,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14068},"to":{"change":3,"start":14068,"end":14112},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" for x in o?.into_iter() {"},{"Add":" state.conflicts.insert(x);"},{"Add":" }"}],"del_contents":[{"Del":" state.conflicts.extend(o?.into_iter());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":253,"ins":{"up_context":[{"change":3,"pos":14945}],"down_context":[{"change":2,"pos":492}],"flag":"BLOCK","start":472,"end":507,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14945},"to":{"change":3,"start":14945,"end":14975},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" conflicts: BTreeSet,"}],"del_contents":[{"Del":" conflicts: Vec,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":314,"ins":{"up_context":[{"change":3,"pos":16985}],"down_context":[{"change":3,"pos":17051}],"flag":"BLOCK","start":508,"end":576,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":16985},"to":{"change":3,"start":16985,"end":17051},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" self.conflicts.insert(Conflict::MultipleNames {"}],"del_contents":[{"Del":" self.conflicts.push(Conflict::MultipleNames {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":330,"ins":{"up_context":[{"change":3,"pos":17597}],"down_context":[{"change":3,"pos":17673}],"flag":"BLOCK","start":577,"end":655,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17597},"to":{"change":3,"start":17597,"end":17673},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" self.conflicts.insert(Conflict::Name { path: name.clone() });"}],"del_contents":[{"Del":" self.conflicts.push(Conflict::Name { path: name.clone() });\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":334,"ins":{"up_context":[{"change":3,"pos":17780}],"down_context":[{"change":3,"pos":17833}],"flag":"BLOCK","start":656,"end":711,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":17780},"to":{"change":3,"start":17780,"end":17833},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" self.conflicts.insert(Conflict::Name {"}],"del_contents":[{"Del":" self.conflicts.push(Conflict::Name {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":439,"ins":{"up_context":[{"change":3,"pos":21305}],"down_context":[{"change":3,"pos":21364}],"flag":"BLOCK","start":712,"end":773,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":21305},"to":{"change":3,"start":21305,"end":21364},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" self.conflicts.insert(Conflict::ZombieFile {"}],"del_contents":[{"Del":" self.conflicts.push(Conflict::ZombieFile {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":671807},"path":"libpijul/src/output/output.rs","line":441,"ins":{"up_context":[{"change":3,"pos":21408}],"down_context":[{"change":3,"pos":679059}],"flag":"BLOCK","start":774,"end":794,"inode":{"change":3,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":21408},"to":{"change":3,"start":21408,"end":21427},"introduced_by":3}],"inode":{"change":3,"pos":671807}},"ins_contents":[{"Add":" });"}],"del_contents":[{"Del":" })\n"}]}}],"owner":"irevoire","repo":"pijul","token":"jxz+C4RkXyfljkMPdWx5xGOfYPuOladat2sbdp1lf2s=","login":null}

…

Dependencies

Change contents