mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-20 11:25:34 +00:00
62e4943c04
Both user and programmatic expressions use the same .evaluate() function now. optimize() is applied globally after symbol resolution. The order shouldn't matter, but it might be nicer because union of commit refs could be rewritten to a single Commits(Vec<CommitId>) node.
269 lines
9.2 KiB
Rust
269 lines
9.2 KiB
Rust
// 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::ResolvedRevsetExpression;
|
|
use jj_lib::revset::RevsetExpression;
|
|
use jj_lib::revset::RevsetFilterPredicate;
|
|
use jj_lib::revset::RevsetIteratorExt;
|
|
|
|
use crate::cli_util::short_commit_hash;
|
|
use crate::cli_util::CommandHelper;
|
|
use crate::cli_util::WorkspaceCommandHelper;
|
|
use crate::command_error::user_error;
|
|
use crate::command_error::CommandError;
|
|
use crate::ui::Ui;
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub(crate) struct MovementArgs {
|
|
pub offset: u64,
|
|
pub edit: bool,
|
|
pub no_edit: bool,
|
|
pub conflict: bool,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
struct MovementArgsInternal {
|
|
offset: u64,
|
|
should_edit: bool,
|
|
conflict: bool,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
|
pub(crate) enum Direction {
|
|
Next,
|
|
Prev,
|
|
}
|
|
|
|
impl Direction {
|
|
fn cmd(&self) -> &'static str {
|
|
match self {
|
|
Direction::Next => "next",
|
|
Direction::Prev => "prev",
|
|
}
|
|
}
|
|
|
|
fn target_not_found_error(
|
|
&self,
|
|
workspace_command: &WorkspaceCommandHelper,
|
|
args: &MovementArgsInternal,
|
|
commits: &[Commit],
|
|
) -> CommandError {
|
|
let offset = args.offset;
|
|
let err_msg = match (self, args.should_edit, args.conflict) {
|
|
// in edit mode, start_revset is the WC, so we only look for direct descendants.
|
|
(Direction::Next, true, true) => {
|
|
String::from("The working copy has no descendants with conflicts")
|
|
}
|
|
(Direction::Next, true, false) => {
|
|
format!("No descendant found {offset} commit(s) forward from the working copy",)
|
|
}
|
|
// in non-edit mode, start_revset is the parent of WC, so we look for other descendants
|
|
// of start_revset.
|
|
(Direction::Next, false, true) => {
|
|
String::from("The working copy parent(s) have no other descendants with conflicts")
|
|
}
|
|
(Direction::Next, false, false) => format!(
|
|
"No other descendant found {offset} commit(s) forward from the working copy \
|
|
parent(s)",
|
|
),
|
|
// The WC can never be an ancestor of the start_revset since start_revset is either
|
|
// itself or it's parent.
|
|
(Direction::Prev, true, true) => {
|
|
String::from("The working copy has no ancestors with conflicts")
|
|
}
|
|
(Direction::Prev, true, false) => {
|
|
format!("No ancestor found {offset} commit(s) back from the working copy",)
|
|
}
|
|
(Direction::Prev, false, true) => {
|
|
String::from("The working copy parent(s) have no ancestors with conflicts")
|
|
}
|
|
(Direction::Prev, false, false) => format!(
|
|
"No ancestor found {offset} commit(s) back from the working copy parents(s)",
|
|
),
|
|
};
|
|
|
|
let template = workspace_command.commit_summary_template();
|
|
let mut cmd_err = user_error(err_msg);
|
|
for commit in commits {
|
|
cmd_err.add_formatted_hint_with(|formatter| {
|
|
if args.should_edit {
|
|
write!(formatter, "Working copy: ")?;
|
|
} else {
|
|
write!(formatter, "Working copy parent: ")?;
|
|
}
|
|
template.format(commit, formatter)
|
|
});
|
|
}
|
|
|
|
cmd_err
|
|
}
|
|
|
|
fn build_target_revset(
|
|
&self,
|
|
working_revset: &Rc<ResolvedRevsetExpression>,
|
|
start_revset: &Rc<ResolvedRevsetExpression>,
|
|
args: &MovementArgsInternal,
|
|
) -> Result<Rc<ResolvedRevsetExpression>, CommandError> {
|
|
let nth = match (self, args.should_edit) {
|
|
(Direction::Next, true) => start_revset.descendants_at(args.offset),
|
|
(Direction::Next, false) => start_revset
|
|
.children()
|
|
.minus(working_revset)
|
|
.descendants_at(args.offset - 1),
|
|
(Direction::Prev, _) => start_revset.ancestors_at(args.offset),
|
|
};
|
|
|
|
let target_revset = match (self, args.conflict) {
|
|
(_, false) => nth,
|
|
(Direction::Next, true) => nth
|
|
.descendants()
|
|
.filtered(RevsetFilterPredicate::HasConflict)
|
|
.roots(),
|
|
// If people desire to move to the root conflict, replace the `heads()` below
|
|
// with `roots(). But let's wait for feedback.
|
|
(Direction::Prev, true) => nth
|
|
.ancestors()
|
|
.filtered(RevsetFilterPredicate::HasConflict)
|
|
.heads(),
|
|
};
|
|
|
|
Ok(target_revset)
|
|
}
|
|
}
|
|
|
|
fn get_target_commit(
|
|
ui: &mut Ui,
|
|
workspace_command: &WorkspaceCommandHelper,
|
|
direction: Direction,
|
|
working_commit_id: &CommitId,
|
|
args: &MovementArgsInternal,
|
|
) -> Result<Commit, 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 args.should_edit {
|
|
wc_revset.clone()
|
|
} else {
|
|
wc_revset.parents()
|
|
};
|
|
|
|
let target_revset = direction.build_target_revset(&wc_revset, &start_revset, args)?;
|
|
|
|
let targets: Vec<Commit> = target_revset
|
|
.evaluate(workspace_command.repo().as_ref())?
|
|
.iter()
|
|
.commits(workspace_command.repo().store())
|
|
.try_collect()?;
|
|
|
|
let target = match targets.as_slice() {
|
|
[target] => target,
|
|
[] => {
|
|
// We found no ancestor/descendant.
|
|
let start_commits: Vec<Commit> = start_revset
|
|
.evaluate(workspace_command.repo().as_ref())?
|
|
.iter()
|
|
.commits(workspace_command.repo().store())
|
|
.try_collect()?;
|
|
return Err(direction.target_not_found_error(workspace_command, args, &start_commits));
|
|
}
|
|
commits => choose_commit(ui, workspace_command, direction, commits)?,
|
|
};
|
|
|
|
Ok(target.clone())
|
|
}
|
|
|
|
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])
|
|
}
|
|
|
|
pub(crate) fn move_to_commit(
|
|
ui: &mut Ui,
|
|
command: &CommandHelper,
|
|
direction: Direction,
|
|
args: &MovementArgs,
|
|
) -> Result<(), CommandError> {
|
|
let mut workspace_command = command.workspace_helper(ui)?;
|
|
|
|
let current_wc_id = workspace_command
|
|
.get_wc_commit_id()
|
|
.ok_or_else(|| user_error("This command requires a working copy"))?;
|
|
|
|
let config_edit_flag = command.settings().config().get_bool("ui.movement.edit")?;
|
|
let args = MovementArgsInternal {
|
|
should_edit: args.edit || (!args.no_edit && config_edit_flag),
|
|
offset: args.offset,
|
|
conflict: args.conflict,
|
|
};
|
|
|
|
let target = get_target_commit(ui, &workspace_command, direction, current_wc_id, &args)?;
|
|
let current_short = short_commit_hash(current_wc_id);
|
|
let target_short = short_commit_hash(target.id());
|
|
let cmd = direction.cmd();
|
|
// We're editing, just move to the target commit.
|
|
if args.should_edit {
|
|
// We're editing, the target must be rewritable.
|
|
workspace_command.check_rewritable([target.id()])?;
|
|
let mut tx = workspace_command.start_transaction();
|
|
tx.edit(&target)?;
|
|
tx.finish(
|
|
ui,
|
|
format!("{cmd}: {current_short} -> editing {target_short}"),
|
|
)?;
|
|
return Ok(());
|
|
}
|
|
let mut tx = workspace_command.start_transaction();
|
|
// Move the working-copy commit to the new parent.
|
|
tx.check_out(&target)?;
|
|
tx.finish(ui, format!("{cmd}: {current_short} -> {target_short}"))?;
|
|
Ok(())
|
|
}
|