forked from mirrors/jj
cli: when pushing all branches (the default), skip open commit
Open commits are work-in-progress and `jj git push --branch <name>` therefore errors out if the branch points to an open commit. However, we don't do the same check if you run `jj git push` to push all branches. This patch introduces such a check. Rather than error out, we skip such branches instead. I didn't make it check for open commits in ancestors. It's quite unusual (at least in my workflow) to have a closed commit on top of an open one. We can revisit if users get surprised by it.
This commit is contained in:
parent
6902c703b3
commit
cdc7a0c242
2 changed files with 36 additions and 1 deletions
|
@ -4364,6 +4364,18 @@ fn cmd_git_push(
|
||||||
BranchPushAction::LocalConflicted => {}
|
BranchPushAction::LocalConflicted => {}
|
||||||
BranchPushAction::RemoteConflicted => {}
|
BranchPushAction::RemoteConflicted => {}
|
||||||
BranchPushAction::Update(update) => {
|
BranchPushAction::Update(update) => {
|
||||||
|
if let Some(new_target) = &update.new_target {
|
||||||
|
let new_target_commit = repo.store().get_commit(new_target)?;
|
||||||
|
// TODO: Should we also skip branches that have open commits as ancestors?
|
||||||
|
if new_target_commit.is_open() {
|
||||||
|
writeln!(
|
||||||
|
ui,
|
||||||
|
"Skipping branch '{}' since it points to an open commit.",
|
||||||
|
branch_name
|
||||||
|
)?;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
branch_updates.insert(branch_name, update);
|
branch_updates.insert(branch_name, update);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,6 +37,29 @@ fn test_git_push() {
|
||||||
insta::assert_snapshot!(get_stdout_string(&assert), @"Nothing changed.
|
insta::assert_snapshot!(get_stdout_string(&assert), @"Nothing changed.
|
||||||
");
|
");
|
||||||
|
|
||||||
|
// When pushing everything, won't push an open commit even if there's a branch
|
||||||
|
// on it
|
||||||
|
test_env
|
||||||
|
.jj_cmd(&workspace_root, &["branch", "my-branch"])
|
||||||
|
.assert()
|
||||||
|
.success();
|
||||||
|
let assert = test_env
|
||||||
|
.jj_cmd(&workspace_root, &["git", "push"])
|
||||||
|
.assert()
|
||||||
|
.success();
|
||||||
|
insta::assert_snapshot!(get_stdout_string(&assert), @r###"
|
||||||
|
Skipping branch 'my-branch' since it points to an open commit.
|
||||||
|
Nothing changed.
|
||||||
|
"###);
|
||||||
|
|
||||||
|
// When pushing a specific branch, won't push it if it points to an open commit
|
||||||
|
let assert = test_env
|
||||||
|
.jj_cmd(&workspace_root, &["git", "push", "--branch", "my-branch"])
|
||||||
|
.assert()
|
||||||
|
.failure();
|
||||||
|
insta::assert_snapshot!(get_stdout_string(&assert), @"Error: Won't push open commit
|
||||||
|
");
|
||||||
|
|
||||||
// Try pushing a conflict
|
// Try pushing a conflict
|
||||||
std::fs::write(workspace_root.join("file"), "first").unwrap();
|
std::fs::write(workspace_root.join("file"), "first").unwrap();
|
||||||
test_env
|
test_env
|
||||||
|
@ -65,6 +88,6 @@ fn test_git_push() {
|
||||||
.jj_cmd(&workspace_root, &["git", "push"])
|
.jj_cmd(&workspace_root, &["git", "push"])
|
||||||
.assert()
|
.assert()
|
||||||
.failure();
|
.failure();
|
||||||
insta::assert_snapshot!(get_stdout_string(&assert), @"Error: Won't push commit 56e09a8ca383 since it has conflicts
|
insta::assert_snapshot!(get_stdout_string(&assert), @"Error: Won't push commit 28b5642cb786 since it has conflicts
|
||||||
");
|
");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue