ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: make jj squash nonexistent warn

Browse source 
This adds a check similar to that for `jj log`, so e.g. `jj squash @`
warns that the `@` argument is interpreted as path.
This commit is contained in:
Martin von Zweigbergk 2023-04-29 16:15:38 -07:00 committed by Martin von Zweigbergk
parent b6b3703800
commit 3ceb2b7c12
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/commands/mod.rs
View file

@ -26,6 +26,7 @@ use std::sync::Arc;
use std::{fs, io}; use std::{fs, io};
use clap::builder::NonEmptyStringValueParser; use clap::builder::NonEmptyStringValueParser;
use clap::parser::ValueSource;
use clap::{ArgGroup, Command, CommandFactory, FromArgMatches, Subcommand}; use clap::{ArgGroup, Command, CommandFactory, FromArgMatches, Subcommand};
use indexmap::{IndexMap, IndexSet}; use indexmap::{IndexMap, IndexSet};
use itertools::Itertools; use itertools::Itertools;
@ -2303,8 +2304,23 @@ from the source will be moved into the parent.
args.interactive, args.interactive,
matcher.as_ref(), matcher.as_ref(),
)?; )?;
if args.interactive && &new_parent_tree_id == parent.tree_id() { if &new_parent_tree_id == parent.tree_id() {
return Err(user_error("No changes selected")); if args.interactive {
return Err(user_error("No changes selected"));
}
if let [only_path] = &args.paths[..] {
let (_, matches) = command.matches().subcommand().unwrap();
if matches.value_source("revision").unwrap() == ValueSource::DefaultValue
&& revset::parse(only_path, &RevsetAliasesMap::new(), None).is_ok()
{
writeln!(
ui.warning(),
"warning: The argument {only_path:?} is being interpreted as a path. To \
specify a revset, pass -r {only_path:?} instead."
)?;
}
}
} }
// Abandon the child if the parent now has all the content from the child // Abandon the child if the parent now has all the content from the child
// (always the case in the non-interactive case). // (always the case in the non-interactive case).

15
tests/test_squash_command.rs
View file

@ -14,7 +14,7 @@
use std::path::Path; use std::path::Path;
use crate::common::TestEnvironment; use crate::common::{get_stderr_string, get_stdout_string, TestEnvironment};
pub mod common; pub mod common;
@ -239,6 +239,19 @@ fn test_squash_partial() {
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: 5e297967f76c (no description set) Working copy now at: 5e297967f76c (no description set)
"###); "###);
// We get a warning if we pass a positional argument that looks like a revset
test_env.jj_cmd_success(&repo_path, &["undo"]);
let assert = test_env
.jj_cmd(&repo_path, &["squash", "b"])
.assert()
.success();
insta::assert_snapshot!(get_stderr_string(&assert), @r###"
warning: The argument "b" is being interpreted as a path. To specify a revset, pass -r "b" instead.
"###);
insta::assert_snapshot!(get_stdout_string(&assert), @r###"
Working copy now at: 1c4e5596a511 (no description set)
"###);
} }
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String { fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {