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

cli: on push, indicate which branches we're going to force-push

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-09-26 09:20:39 -07:00 committed by Martin von Zweigbergk
parent 2d2ed53a34
commit d1565fb6eb
2 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/commands.rs
View file

@ -4339,6 +4339,7 @@ fn cmd_git_push(
let mut ref_updates = vec![]; let mut ref_updates = vec![];
let mut new_heads = vec![]; let mut new_heads = vec![];
let mut force_pushed_branches = hashset! {};
for (branch_name, update) in &branch_updates { for (branch_name, update) in &branch_updates {
let qualified_name = format!("refs/heads/{}", branch_name); let qualified_name = format!("refs/heads/{}", branch_name);
if let Some(new_target) = &update.new_target { if let Some(new_target) = &update.new_target {
@ -4347,6 +4348,9 @@ fn cmd_git_push(
None => false, None => false,
Some(old_target) => !repo.index().is_ancestor(old_target, new_target), Some(old_target) => !repo.index().is_ancestor(old_target, new_target),
}; };
if force {
force_pushed_branches.insert(branch_name.to_string());
}
ref_updates.push(GitRefUpdate { ref_updates.push(GitRefUpdate {
qualified_name, qualified_name,
force, force,
@ -4401,6 +4405,14 @@ fn cmd_git_push(
for (branch_name, update) in &branch_updates { for (branch_name, update) in &branch_updates {
match (&update.old_target, &update.new_target) { match (&update.old_target, &update.new_target) {
(Some(old_target), Some(new_target)) => { (Some(old_target), Some(new_target)) => {
if force_pushed_branches.contains(branch_name) {
writeln!(
ui,
" Force branch {branch_name} from {} to {}",
short_commit_hash(old_target),
short_commit_hash(new_target)
)?;
} else {
writeln!( writeln!(
ui, ui,
" Move branch {branch_name} from {} to {}", " Move branch {branch_name} from {} to {}",
@ -4408,6 +4420,7 @@ fn cmd_git_push(
short_commit_hash(new_target) short_commit_hash(new_target)
)?; )?;
} }
}
(Some(old_target), None) => { (Some(old_target), None) => {
writeln!( writeln!(
ui, ui,

28
tests/test_git_push.rs
View file

@ -79,10 +79,8 @@ fn test_git_push_current_branch() {
&workspace_root, &workspace_root,
&["describe", "branch1", "-m", "modified branch1 commit"], &["describe", "branch1", "-m", "modified branch1 commit"],
); );
test_env.jj_cmd_success( test_env.jj_cmd_success(&workspace_root, &["co", "branch2"]);
&workspace_root, test_env.jj_cmd_success(&workspace_root, &["branch", "set", "branch2"]);
&["branch", "set", "--allow-backwards", "branch2"],
);
test_env.jj_cmd_success(&workspace_root, &["branch", "create", "my-branch"]); test_env.jj_cmd_success(&workspace_root, &["branch", "create", "my-branch"]);
test_env.jj_cmd_success(&workspace_root, &["describe", "-m", "foo"]); test_env.jj_cmd_success(&workspace_root, &["describe", "-m", "foo"]);
// Check the setup // Check the setup
@ -90,30 +88,30 @@ fn test_git_push_current_branch() {
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
branch1: 5d0d85ed3da7 modified branch1 commit branch1: 5d0d85ed3da7 modified branch1 commit
@origin (ahead by 1 commits, behind by 1 commits): a3ccc578ea7b description 1 @origin (ahead by 1 commits, behind by 1 commits): a3ccc578ea7b description 1
branch2: 7840c9885676 foo branch2: 60db6d808983 foo
@origin (ahead by 1 commits, behind by 1 commits): 7fd4b07286b3 description 2 @origin (behind by 1 commits): 7fd4b07286b3 description 2
my-branch: 7840c9885676 foo my-branch: 60db6d808983 foo
"###); "###);
// First dry-run. `branch1` should not get pushed. // First dry-run. `branch1` should not get pushed.
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "--dry-run"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "--dry-run"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin: Branch changes to push to origin:
Move branch branch2 from 7fd4b07286b3 to 7840c9885676 Move branch branch2 from 7fd4b07286b3 to 60db6d808983
Add branch my-branch to 7840c9885676 Add branch my-branch to 60db6d808983
Dry-run requested, not pushing. Dry-run requested, not pushing.
"###); "###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin: Branch changes to push to origin:
Move branch branch2 from 7fd4b07286b3 to 7840c9885676 Move branch branch2 from 7fd4b07286b3 to 60db6d808983
Add branch my-branch to 7840c9885676 Add branch my-branch to 60db6d808983
"###); "###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
branch1: 5d0d85ed3da7 modified branch1 commit branch1: 5d0d85ed3da7 modified branch1 commit
@origin (ahead by 1 commits, behind by 1 commits): a3ccc578ea7b description 1 @origin (ahead by 1 commits, behind by 1 commits): a3ccc578ea7b description 1
branch2: 7840c9885676 foo branch2: 60db6d808983 foo
my-branch: 7840c9885676 foo my-branch: 60db6d808983 foo
"###); "###);
} }
@ -151,7 +149,7 @@ fn test_git_push_all() {
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin: Branch changes to push to origin:
Delete branch branch1 from a3ccc578ea7b Delete branch branch1 from a3ccc578ea7b
Move branch branch2 from 7fd4b07286b3 to 7840c9885676 Force branch branch2 from 7fd4b07286b3 to 7840c9885676
Add branch my-branch to 7840c9885676 Add branch my-branch to 7840c9885676
Dry-run requested, not pushing. Dry-run requested, not pushing.
"###); "###);
@ -159,7 +157,7 @@ fn test_git_push_all() {
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin: Branch changes to push to origin:
Delete branch branch1 from a3ccc578ea7b Delete branch branch1 from a3ccc578ea7b
Move branch branch2 from 7fd4b07286b3 to 7840c9885676 Force branch branch2 from 7fd4b07286b3 to 7840c9885676
Add branch my-branch to 7840c9885676 Add branch my-branch to 7840c9885676
"###); "###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["branch", "list"]);