{"header":{"message":"channel switch as an alias to reset","description":null,"timestamp":"2020-11-21T19:03:41.602419278Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","authors":[],"deps":{"hashes":[["VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","channel switch as an alias to reset"],["AA",null],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","Credit and reset relative to current directory instead of the root"],["M3VTIZCPE7CMJXRENE7J3DYEXA4KILMNYLPMPCDRCWXTJ34JKSCQC","Validate change before reset"]],"deps":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC"],"known":["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","M3VTIZCPE7CMJXRENE7J3DYEXA4KILMNYLPMPCDRCWXTJ34JKSCQC","NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC"]},"hunks":[{"Edit":{"inode":{"change":2,"pos":83981},"path":"pijul/src/main.rs","line":150,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":87776}],"down_context":[{"change":2,"pos":87776}],"flag":"","start":0,"end":82,"inode":{"change":2,"pos":83981}}},"contents":[{"Add":" #[error(\"Cannot delete the current channel\")]"},{"Add":" CannotDeleteCurrentChannel,"}]}},{"Edit":{"inode":{"change":2,"pos":89866},"path":"pijul/src/config.rs","line":62,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":91609}],"down_context":[{"change":2,"pos":91609}],"flag":"","start":83,"end":289,"inode":{"change":2,"pos":89866}}},"contents":[{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn current_channel<'a>(&'a self) -> Option<&'a str> {"},{"Add":" if let Some(ref channel) = self.current_channel {"},{"Add":" Some(channel.as_str())"},{"Add":" } else {"},{"Add":" None"}]}},{"Replacement":{"inode":{"change":2,"pos":97650},"path":"pijul/src/commands/reset.rs","line":13,"ins":{"up_context":[{"change":2,"pos":97874}],"down_context":[{"change":2,"pos":97906}],"flag":"","start":290,"end":326,"inode":{"change":2,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":97874},"to":{"change":2,"start":97874,"end":97906},"introduced_by":2}],"inode":{"change":2,"pos":97650}},"ins_contents":[{"Add":" pub repo_path: Option,"}],"del_contents":[{"Del":" repo_path: Option,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":97650},"path":"pijul/src/commands/reset.rs","line":15,"ins":{"up_context":[{"change":2,"pos":97936}],"down_context":[{"change":2,"pos":97965}],"flag":"","start":327,"end":360,"inode":{"change":2,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":97936},"to":{"change":2,"start":97936,"end":97965},"introduced_by":2}],"inode":{"change":2,"pos":97650}},"ins_contents":[{"Add":" pub channel: Option,"}],"del_contents":[{"Del":" channel: Option,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":97650},"path":"pijul/src/commands/reset.rs","line":17,"ins":{"up_context":[{"change":2,"pos":97995}],"down_context":[{"change":2,"pos":98014}],"flag":"","start":361,"end":384,"inode":{"change":2,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":97995},"to":{"change":2,"start":97995,"end":98014},"introduced_by":2}],"inode":{"change":2,"pos":97650}},"ins_contents":[{"Add":" pub dry_run: bool,"}],"del_contents":[{"Del":" dry_run: bool,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":97650},"path":"pijul/src/commands/reset.rs","line":19,"ins":{"up_context":[{"change":2,"pos":98043}],"down_context":[{"change":2,"pos":98096}],"flag":"","start":385,"end":446,"inode":{"change":2,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":98043},"to":{"change":2,"start":98043,"end":98096},"introduced_by":2}],"inode":{"change":2,"pos":97650}},"ins_contents":[{"Add":" pub change: Option,"},{"Add":" pub files: Vec,"}],"del_contents":[{"Del":" change: Option,\n files: Vec,\n"}]}},{"Edit":{"inode":{"change":2,"pos":97650},"path":"pijul/src/commands/reset.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":98164}],"down_context":[{"change":2,"pos":98164}],"flag":"","start":447,"end":642,"inode":{"change":2,"pos":97650}}},"contents":[{"Add":" self.reset(true)"},{"Add":" }"},{"Add":""},{"Add":" pub fn switch(self) -> Result<(), anyhow::Error> {"},{"Add":" self.reset(false)"},{"Add":" }"},{"Add":""},{"Add":" fn reset(self, overwrite_changes: bool) -> Result<(), anyhow::Error> {"}]}},{"Replacement":{"inode":{"change":2,"pos":97650},"path":"pijul/src/commands/reset.rs","line":72,"ins":{"up_context":[{"change":2,"pos":99700}],"down_context":[{"change":2,"pos":99838}],"flag":"","start":643,"end":934,"inode":{"change":2,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":99700},"to":{"change":2,"start":99700,"end":99838},"introduced_by":2}],"inode":{"change":2,"pos":97650}},"ins_contents":[{"Add":" if self.channel.as_ref().map(|x| x.as_str()) == Some(current_channel) {"},{"Add":" if !overwrite_changes {"},{"Add":" // No need to change channel, no need to reset."},{"Add":" return Ok(())"},{"Add":" }"},{"Add":" } else if self.channel.is_some() {"}],"del_contents":[{"Del":" if self.channel.is_some()\n && self.channel.as_ref().map(|x| x.as_str()) != Some(current_channel)\n {\n"}]}},{"Edit":{"inode":{"change":2,"pos":186892},"path":"pijul/src/commands/channel.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":187365}],"down_context":[{"change":2,"pos":187365}],"flag":"","start":935,"end":999,"inode":{"change":2,"pos":186892}}},"contents":[{"Add":" #[clap(name = \"switch\")]"},{"Add":" Switch { to: Option },"}]}},{"Edit":{"inode":{"change":2,"pos":186892},"path":"pijul/src/commands/channel.rs","line":28,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":187435},"to":{"change":2,"start":187435,"end":187494},"introduced_by":2}],"inode":{"change":2,"pos":186892}}},"contents":[{"Del":" let repo = Repository::find_root(self.repo_path)?;\n"}]}},{"Edit":{"inode":{"change":2,"pos":186892},"path":"pijul/src/commands/channel.rs","line":29,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":187538},"to":{"change":2,"start":187538,"end":187685},"introduced_by":2}],"inode":{"change":2,"pos":186892}}},"contents":[{"Del":" let current = if let Some(ref c) = repo.config.current_channel {\n Some(c.as_str())\n } else {\n None\n };\n"}]}},{"Edit":{"inode":{"change":2,"pos":186892},"path":"pijul/src/commands/channel.rs","line":31,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":187735}],"down_context":[{"change":2,"pos":187735}],"flag":"","start":1000,"end":1128,"inode":{"change":2,"pos":186892}}},"contents":[{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" let current = repo.config.current_channel();"}]}},{"Edit":{"inode":{"change":2,"pos":186892},"path":"pijul/src/commands/channel.rs","line":45,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":188244}],"down_context":[{"change":2,"pos":188244}],"flag":"","start":1129,"end":1409,"inode":{"change":2,"pos":186892}}},"contents":[{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" let current = repo.config.current_channel();"},{"Add":" if Some(delete.as_str()) == current {"},{"Add":" return Err(crate::Error::CannotDeleteCurrentChannel.into())"},{"Add":" }"}]}},{"Edit":{"inode":{"change":2,"pos":186892},"path":"pijul/src/commands/channel.rs","line":54,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":188393}],"down_context":[{"change":2,"pos":188393}],"flag":"","start":1410,"end":1741,"inode":{"change":2,"pos":186892}}},"contents":[{"Add":" Some(SubCommand::Switch { to }) => {"},{"Add":" (crate::commands::reset::Reset {"},{"Add":" repo_path: self.repo_path,"},{"Add":" channel: to,"},{"Add":" dry_run: false,"},{"Add":" change: None,"},{"Add":" files: Vec::new(),"},{"Add":" }).switch()?;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":2,"pos":186892},"path":"pijul/src/commands/channel.rs","line":64,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":188456}],"down_context":[{"change":2,"pos":188456}],"flag":"","start":1742,"end":1870,"inode":{"change":2,"pos":186892}}},"contents":[{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" let current = repo.config.current_channel();"}]}}],"owner":"irevoire","repo":"pijul","token":"FBtISb5UusM4zErJ+OH/Z9NZNvKF2azQIafB56y3Yg8=","login":null}

…

Dependencies

Change contents