{"header":{"message":"Fixing conflicts","description":null,"timestamp":"2024-02-07T17:15:11.881689911Z","authors":[{}]},"hash":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC","Fixing conflicts"],["AA",null],["DDJO7X2P2BAJSXPOE6ODKAJM7GRWKPT36WWTUZ373ZWQRYU4CFIAC","Remove dependency on `num_cpus`"],["IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC","reset: Require --force to reset unspecified unrecorded changes"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"]],"deps":["DDJO7X2P2BAJSXPOE6ODKAJM7GRWKPT36WWTUZ373ZWQRYU4CFIAC","IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":115,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7839},"to":{"change":2,"start":704,"end":769},"introduced_by":2},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":4,"pos":7839},"to":{"change":2,"start":704,"end":769},"introduced_by":3}],"inode":{"change":4,"pos":97650}}},"contents":[{"Del":{"text":" std::thread::available_parallelism()?.get(),","pos":"DDJO7X2P2BAJSXPOE6ODKAJM7GRWKPT36WWTUZ373ZWQRYU4CFIAC:768"}}]}},{"Replacement":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":126,"ins":{"up_context":[{"change":4,"pos":4079}],"down_context":[{"change":3,"pos":361}],"flag":"BLOCK","start":0,"end":141,"inode":{"change":4,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4079},"to":{"change":3,"start":256,"end":361},"introduced_by":3}],"inode":{"change":4,"pos":97650}},"ins_contents":[{"Add":{"text":" if !self.force","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:30"}},{"Add":{"text":" && has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap()","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:122"}},{"Add":{"text":" {","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:140"}}],"del_contents":[{"Del":{"text":" if !self.force && has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap() {","pos":"IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC:360"}}]}},{"Replacement":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":280,"ins":{"up_context":[{"change":3,"pos":474}],"down_context":[{"change":3,"pos":662}],"flag":"BLOCK","start":142,"end":293,"inode":{"change":4,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":474},"to":{"change":3,"start":474,"end":662},"introduced_by":3}],"inode":{"change":4,"pos":97650}},"ins_contents":[{"Add":{"text":"fn has_unrecorded_changes(","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:168"}},{"Add":{"text":" txn: ArcTxn>,","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:197"}},{"Add":{"text":" channel: ChannelRef>,","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:234"}},{"Add":{"text":" repo: &Repository,","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:257"}},{"Add":{"text":") -> Result {","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:292"}}],"del_contents":[{"Del":{"text":"fn has_unrecorded_changes(txn: ArcTxn>,","pos":"IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC:524"}},{"Del":{"text":" channel: ChannelRef>,","pos":"IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC:583"}},{"Del":{"text":" repo: &Repository) -> Result {","pos":"IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC:661"}}]}},{"Replacement":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":295,"ins":{"up_context":[{"change":3,"pos":918}],"down_context":[{"change":3,"pos":943}],"flag":"BLOCK","start":294,"end":347,"inode":{"change":4,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":918},"to":{"change":3,"start":918,"end":943},"introduced_by":3}],"inode":{"change":4,"pos":97650}},"ins_contents":[{"Add":{"text":" std::thread::available_parallelism()?.get(),","pos":"44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC:346"}}],"del_contents":[{"Del":{"text":" num_cpus::get(),","pos":"IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC:942"}}]}}],"owner":"benaryorg","repo":"pijul","token":"WFhQU52dfk1xR4HmnF5HrHKJ/jCoPopwkwp02tN2u4Y=","login":null}

…

Dependencies

Change contents

Review