mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

absorb: show warning if source commit contains file deletion

Browse source
This commit is contained in:
Yuya Nishihara 2025-01-15 14:17:51 +09:00
parent f7431650be
commit 3711979a8f
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cli/tests/test_absorb_command.rs
View file

@ -438,6 +438,25 @@ fn test_absorb_conflict() {
");
}
#[test]
fn test_absorb_deleted_file() {
let test_env = TestEnvironment::default();
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
let repo_path = test_env.env_root().join("repo");
test_env.jj_cmd_ok(&repo_path, &["describe", "-m1"]);
std::fs::write(repo_path.join("file1"), "1a\n").unwrap();
test_env.jj_cmd_ok(&repo_path, &["new"]);
std::fs::remove_file(repo_path.join("file1")).unwrap();
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["absorb"]);
insta::assert_snapshot!(stderr, @r"
Warning: Skipping file1: Deleted file
Nothing changed.
");
}
#[test]
fn test_absorb_file_mode() {
let test_env = TestEnvironment::default();

11
lib/src/absorb.rs
View file

@ -110,6 +110,7 @@ pub async fn split_hunks_to_trees(
let (left_value, right_value) = entry.values?;
let (left_text, executable) = match to_file_value(left_value) {
Ok(Some(mut value)) => (value.read(left_path)?, value.executable),
// New file should have no destinations
Ok(None) => continue,
Err(reason) => {
selected_trees
@ -120,7 +121,15 @@ pub async fn split_hunks_to_trees(
};
let right_text = match to_file_value(right_value) {
Ok(Some(mut value)) => value.read(right_path)?,
Ok(None) => continue,
// Deleted file could be absorbed, but that would require special
// handling to propagate deletion of the tree entry
Ok(None) => {
let reason = "Deleted file".to_owned();
selected_trees
.skipped_paths
.push((right_path.to_owned(), reason));
continue;
}
Err(reason) => {
selected_trees
.skipped_paths