-
Notifications
You must be signed in to change notification settings - Fork 346
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
no-op: Refactor movement utilities into cli/src/movement_utils.rs
The code in both cli/src/commands/{next,prev}.rs is identical except
for the direction of movement. This no-op PR pull the parts that make
sense out into cli/src/movement_util.rs so it's easier to see the
differences.
Part of #3947- Loading branch information
Showing
4 changed files
with
196 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| // Copyright 2020 The Jujutsu Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use std::io::Write; | ||
| use std::rc::Rc; | ||
|
|
||
| use itertools::Itertools; | ||
| use jj_lib::backend::CommitId; | ||
| use jj_lib::commit::Commit; | ||
| use jj_lib::repo::Repo; | ||
| use jj_lib::revset::{RevsetExpression, RevsetFilterPredicate, RevsetIteratorExt}; | ||
|
|
||
| use crate::cli_util::WorkspaceCommandHelper; | ||
| use crate::command_error::{user_error, CommandError}; | ||
| use crate::ui::Ui; | ||
|
|
||
| pub enum Direction { | ||
| Next, | ||
| Prev, | ||
| } | ||
|
|
||
| impl Direction { | ||
| fn cmd(&self) -> String { | ||
| match self { | ||
| Direction::Next => "next".to_string(), | ||
| Direction::Prev => "prev".to_string(), | ||
| } | ||
| } | ||
| fn direction(&self) -> String { | ||
| match self { | ||
| Direction::Next => "forward".to_string(), | ||
| Direction::Prev => "back".to_string(), | ||
| } | ||
| } | ||
|
|
||
| fn next_node_type(&self) -> String { | ||
| match self { | ||
| Direction::Next => "descendant".to_string(), | ||
| Direction::Prev => "ancestor".to_string(), | ||
| } | ||
| } | ||
|
|
||
| fn get_target_revset( | ||
| &self, | ||
| working_commit_id: &CommitId, | ||
| edit: bool, | ||
| has_conflict: bool, | ||
| change_offset: u64, | ||
| ) -> Result<Rc<RevsetExpression>, CommandError> { | ||
| let wc_revset = RevsetExpression::commit(working_commit_id.clone()); | ||
| // If we're editing, start at the working-copy commit. Otherwise, start from | ||
| // its direct parent(s). | ||
| let start_revset = if edit { | ||
| wc_revset.clone() | ||
| } else { | ||
| wc_revset.parents() | ||
| }; | ||
|
|
||
| let target_revset = match self { | ||
| Direction::Next => if has_conflict { | ||
| start_revset | ||
| .children() | ||
| .descendants() | ||
| .filtered(RevsetFilterPredicate::HasConflict) | ||
| .roots() | ||
| } else { | ||
| start_revset.descendants_at(change_offset) | ||
| } | ||
| .minus(&wc_revset), | ||
|
|
||
| Direction::Prev => { | ||
| if has_conflict { | ||
| // If people desire to move to the root conflict, replace the `heads()` below | ||
| // with `roots(). But let's wait for feedback. | ||
| start_revset | ||
| .parents() | ||
| .ancestors() | ||
| .filtered(RevsetFilterPredicate::HasConflict) | ||
| .heads() | ||
| } else { | ||
| start_revset.ancestors_at(change_offset) | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| Ok(target_revset) | ||
| } | ||
| } | ||
|
|
||
| pub fn get_target_commit( | ||
| ui: &mut Ui, | ||
| workspace_command: &WorkspaceCommandHelper, | ||
| direction: Direction, | ||
| working_commit_id: &CommitId, | ||
| edit: bool, | ||
| has_conflict: bool, | ||
| change_offset: u64, | ||
| ) -> Result<Commit, CommandError> { | ||
| let target_revset = | ||
| direction.get_target_revset(working_commit_id, edit, has_conflict, change_offset)?; | ||
| let targets: Vec<Commit> = target_revset | ||
| .evaluate_programmatic(workspace_command.repo().as_ref())? | ||
| .iter() | ||
| .commits(workspace_command.repo().store()) | ||
| .try_collect()?; | ||
|
|
||
| let target = match targets.as_slice() { | ||
| [target] => target, | ||
| [] => { | ||
| // We found no descendant. | ||
| return Err(user_error(format!( | ||
| "No {} found {} commit{} {}", | ||
| direction.next_node_type(), | ||
| change_offset, | ||
| if change_offset > 1 { "s" } else { "" }, | ||
| direction.direction(), | ||
| ))); | ||
| } | ||
| commits => choose_commit(ui, workspace_command, &direction, commits)?, | ||
| }; | ||
|
|
||
| Ok(target.clone()) | ||
| } | ||
|
|
||
| pub fn choose_commit<'a>( | ||
| ui: &mut Ui, | ||
| workspace_command: &WorkspaceCommandHelper, | ||
| direction: &Direction, | ||
| commits: &'a [Commit], | ||
| ) -> Result<&'a Commit, CommandError> { | ||
| writeln!( | ||
| ui.stdout(), | ||
| "ambiguous {} commit, choose one to target:", | ||
| direction.cmd() | ||
| )?; | ||
| let mut formatter = ui.stdout_formatter(); | ||
| let template = workspace_command.commit_summary_template(); | ||
| let mut choices: Vec<String> = Default::default(); | ||
| for (i, commit) in commits.iter().enumerate() { | ||
| write!(formatter, "{}: ", i + 1)?; | ||
| template.format(commit, formatter.as_mut())?; | ||
| writeln!(formatter)?; | ||
| choices.push(format!("{}", i + 1)); | ||
| } | ||
| writeln!(formatter, "q: quit the prompt")?; | ||
| choices.push("q".to_string()); | ||
| drop(formatter); | ||
|
|
||
| let choice = ui.prompt_choice( | ||
| "enter the index of the commit you want to target", | ||
| &choices, | ||
| None, | ||
| )?; | ||
| if choice == "q" { | ||
| return Err(user_error("ambiguous target commit")); | ||
| } | ||
|
|
||
| Ok(&commits[choice.parse::<usize>().unwrap() - 1]) | ||
| } |