// Copyright 2020-2023 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 clap_complete::ArgValueCandidates;use clap_complete::ArgValueCompleter;use itertools::Itertools as _;use jj_lib::object_id::ObjectId as _;use jj_lib::op_store::RefTarget;use jj_lib::str_util::StringPattern; use super::find_bookmarks_with;use super::is_fast_forward;use crate::cli_util::CommandHelper;use crate::cli_util::RevisionArg;use crate::command_error::user_error_with_hint;use crate::command_error::CommandError;use crate::complete;use crate::ui::Ui; /// Move existing bookmarks to target revision////// If bookmark names are given, the specified bookmarks will be updated to/// point to the target revision.////// If `--from` options are given, bookmarks currently pointing to the/// specified revisions will be updated. The bookmarks can also be filtered by/// names.////// Example: pull up the nearest bookmarks to the working-copy parent////// $ jj bookmark move --from 'heads(::@- & bookmarks())' --to @-#[derive(clap::Args, Clone, Debug)]#[command(group(clap::ArgGroup::new("source").multiple(true).required(true)))]pub struct BookmarkMoveArgs { /// Move bookmarks matching the given name patterns /// /// By default, the specified name matches exactly. Use `glob:` prefix to /// select bookmarks by [wildcard pattern]. /// /// [wildcard pattern]: /// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns #[arg( group = "source", value_parser = StringPattern::parse, add = ArgValueCandidates::new(complete::local_bookmarks), )] names: Vec<StringPattern>, /// Move bookmarks from the given revisions #[arg( long, short, group = "source", value_name = "REVSETS", add = ArgValueCompleter::new(complete::revset_expression_all), )] from: Vec<RevisionArg>, // TODO(#5374): Make required in jj 0.32+ /// Move bookmarks to this revision // Currently this defaults to the working copy, but in the near // future it will be required to explicitly specify it. #[arg( long, short, value_name = "REVSET", add = ArgValueCompleter::new(complete::revset_expression_all), )] to: Option<RevisionArg>, /// Allow moving bookmarks backwards or sideways #[arg(long, short = 'B')] allow_backwards: bool,} pub fn cmd_bookmark_move( ui: &mut Ui, command: &CommandHelper, args: &BookmarkMoveArgs,) -> Result<(), CommandError> { let mut workspace_command = command.workspace_helper(ui)?; let repo = workspace_command.repo().clone(); if args.to.is_none() { writeln!( ui.warning_default(), "Target revision was not specified, defaulting to the working copy (--to=@). In the \ near future it will be required to explicitly specify it." )?; } let target_commit = workspace_command.resolve_single_rev(ui, args.to.as_ref().unwrap_or(&RevisionArg::AT))?; let matched_bookmarks = { let is_source_ref: Box<dyn Fn(&RefTarget) -> _> = if !args.from.is_empty() { let is_source_commit = workspace_command .parse_union_revsets(ui, &args.from)? .evaluate()? .containing_fn(); Box::new(move |target: &RefTarget| { for id in target.added_ids() { if is_source_commit(id)? { return Ok(true); } } Ok(false) }) } else { Box::new(|_| Ok(true)) }; let mut bookmarks = if !args.names.is_empty() { find_bookmarks_with(&args.names, |pattern| { repo.view() .local_bookmarks_matching(pattern) .filter_map(|(name, target)| { is_source_ref(target) .map(|matched| matched.then_some((name, target))) .transpose() }) })? } else { repo.view() .local_bookmarks() .filter_map(|(name, target)| { is_source_ref(target) .map(|matched| matched.then_some((name, target))) .transpose() }) .try_collect()? }; // Noop matches aren't error, but should be excluded from stats. bookmarks.retain(|(_, old_target)| old_target.as_normal() != Some(target_commit.id())); bookmarks }; if matched_bookmarks.is_empty() { writeln!(ui.status(), "No bookmarks to update.")?; return Ok(()); } if !args.allow_backwards { if let Some((name, _)) = matched_bookmarks .iter() .find(|(_, old_target)| !is_fast_forward(repo.as_ref(), old_target, target_commit.id())) { return Err(user_error_with_hint( format!( "Refusing to move bookmark backwards or sideways: {name}", name = name.as_symbol() ), "Use --allow-backwards to allow it.", )); } } let mut tx = workspace_command.start_transaction(); for (name, _) in &matched_bookmarks { tx.repo_mut() .set_local_bookmark_target(name, RefTarget::normal(target_commit.id().clone())); } if let Some(mut formatter) = ui.status_formatter() { write!(formatter, "Moved {} bookmarks to ", matched_bookmarks.len())?; tx.write_commit_summary(formatter.as_mut(), &target_commit)?; writeln!(formatter)?; } if matched_bookmarks.len() > 1 && args.names.is_empty() { writeln!( ui.hint_default(), "Specify bookmark by name to update just one of the bookmarks." )?; } tx.finish( ui, format!( "point bookmark {names} to commit {id}", names = matched_bookmarks .iter() .map(|(name, _)| name.as_symbol()) .join(", "), id = target_commit.id().hex() ), )?; Ok(())}
// Copyright 2020-2023 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 clap_complete::ArgValueCandidates;
use clap_complete::ArgValueCompleter;
use itertools::Itertools as _;
use jj_lib::object_id::ObjectId as _;
use jj_lib::op_store::RefTarget;
use jj_lib::str_util::StringPattern;
use super::find_bookmarks_with;
use super::is_fast_forward;
use crate::cli_util::CommandHelper;
use crate::cli_util::RevisionArg;
use crate::command_error::user_error_with_hint;
use crate::command_error::CommandError;
use crate::complete;
use crate::ui::Ui;
/// Move existing bookmarks to target revision
///
/// If bookmark names are given, the specified bookmarks will be updated to
/// point to the target revision.
///
/// If `--from` options are given, bookmarks currently pointing to the
/// specified revisions will be updated. The bookmarks can also be filtered by
/// names.
///
/// Example: pull up the nearest bookmarks to the working-copy parent
///
/// $ jj bookmark move --from 'heads(::@- & bookmarks())' --to @-
#[derive(clap::Args, Clone, Debug)]
#[command(group(clap::ArgGroup::new("source").multiple(true).required(true)))]
pub struct BookmarkMoveArgs {
/// Move bookmarks matching the given name patterns
///
/// By default, the specified name matches exactly. Use `glob:` prefix to
/// select bookmarks by [wildcard pattern].
///
/// [wildcard pattern]:
/// https://jj-vcs.github.io/jj/latest/revsets/#string-patterns
#[arg(
group = "source",
value_parser = StringPattern::parse,
add = ArgValueCandidates::new(complete::local_bookmarks),
)]
names: Vec<StringPattern>,
/// Move bookmarks from the given revisions
#[arg(
long, short,
group = "source",
value_name = "REVSETS",
add = ArgValueCompleter::new(complete::revset_expression_all),
)]
from: Vec<RevisionArg>,
// TODO(#5374): Make required in jj 0.32+
/// Move bookmarks to this revision
// Currently this defaults to the working copy, but in the near
// future it will be required to explicitly specify it.
#[arg(
long, short,
value_name = "REVSET",
add = ArgValueCompleter::new(complete::revset_expression_all),
)]
to: Option<RevisionArg>,
/// Allow moving bookmarks backwards or sideways
#[arg(long, short = 'B')]
allow_backwards: bool,
}
pub fn cmd_bookmark_move(
ui: &mut Ui,
command: &CommandHelper,
args: &BookmarkMoveArgs,
) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?;
let repo = workspace_command.repo().clone();
if args.to.is_none() {
writeln!(
ui.warning_default(),
"Target revision was not specified, defaulting to the working copy (--to=@). In the \
near future it will be required to explicitly specify it."
)?;
}
let target_commit =
workspace_command.resolve_single_rev(ui, args.to.as_ref().unwrap_or(&RevisionArg::AT))?;
let matched_bookmarks = {
let is_source_ref: Box<dyn Fn(&RefTarget) -> _> = if !args.from.is_empty() {
let is_source_commit = workspace_command
.parse_union_revsets(ui, &args.from)?
.evaluate()?
.containing_fn();
Box::new(move |target: &RefTarget| {
for id in target.added_ids() {
if is_source_commit(id)? {
return Ok(true);
}
}
Ok(false)
})
} else {
Box::new(|_| Ok(true))
};
let mut bookmarks = if !args.names.is_empty() {
find_bookmarks_with(&args.names, |pattern| {
repo.view()
.local_bookmarks_matching(pattern)
.filter_map(|(name, target)| {
is_source_ref(target)
.map(|matched| matched.then_some((name, target)))
.transpose()
})
})?
} else {
repo.view()
.local_bookmarks()
.filter_map(|(name, target)| {
is_source_ref(target)
.map(|matched| matched.then_some((name, target)))
.transpose()
})
.try_collect()?
};
// Noop matches aren't error, but should be excluded from stats.
bookmarks.retain(|(_, old_target)| old_target.as_normal() != Some(target_commit.id()));
bookmarks
};
if matched_bookmarks.is_empty() {
writeln!(ui.status(), "No bookmarks to update.")?;
return Ok(());
}
if !args.allow_backwards {
if let Some((name, _)) = matched_bookmarks
.iter()
.find(|(_, old_target)| !is_fast_forward(repo.as_ref(), old_target, target_commit.id()))
{
return Err(user_error_with_hint(
format!(
"Refusing to move bookmark backwards or sideways: {name}",
name = name.as_symbol()
),
"Use --allow-backwards to allow it.",
));
}
}
let mut tx = workspace_command.start_transaction();
for (name, _) in &matched_bookmarks {
tx.repo_mut()
.set_local_bookmark_target(name, RefTarget::normal(target_commit.id().clone()));
}
if let Some(mut formatter) = ui.status_formatter() {
write!(formatter, "Moved {} bookmarks to ", matched_bookmarks.len())?;
tx.write_commit_summary(formatter.as_mut(), &target_commit)?;
writeln!(formatter)?;
}
if matched_bookmarks.len() > 1 && args.names.is_empty() {
writeln!(
ui.hint_default(),
"Specify bookmark by name to update just one of the bookmarks."
)?;
}
tx.finish(
ui,
format!(
"point bookmark {names} to commit {id}",
names = matched_bookmarks
.iter()
.map(|(name, _)| name.as_symbol())
.join(", "),
id = target_commit.id().hex()
),
)?;
Ok(())
}