mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-15 08:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

cli: do not error out on re-track/untrack, show warning instead

Browse source 
If we add glob support, users will probably want to do something like
'jj branch untrack glob:"*@origin"'. It would be annoying if the command
failed just because one of the remote branches has already been untracked.
Since branch tracking/untracking is idempotent, it's safe to continue in
those cases.
This commit is contained in:
Yuya Nishihara 2023-10-20 13:14:09 +09:00
parent 171896aefa
commit d43704c978
2 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cli/src/commands/branch.rs
View file

@ -402,18 +402,21 @@ fn cmd_branch_track(
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?; let mut workspace_command = command.workspace_helper(ui)?;
let view = workspace_command.repo().view(); let view = workspace_command.repo().view();
let mut names = Vec::new();
for name in &args.names { for name in &args.names {
let remote_ref = view.get_remote_branch(&name.branch, &name.remote); let remote_ref = view.get_remote_branch(&name.branch, &name.remote);
if remote_ref.is_absent() { if remote_ref.is_absent() {
return Err(user_error(format!("No such remote branch: {name}"))); return Err(user_error(format!("No such remote branch: {name}")));
} }
if remote_ref.is_tracking() { if remote_ref.is_tracking() {
return Err(user_error(format!("Remote branch already tracked: {name}"))); writeln!(ui.warning(), "Remote branch already tracked: {name}")?;
} else {
names.push(name.clone());
} }
} }
let mut tx = workspace_command let mut tx = workspace_command
.start_transaction(&format!("track remote {}", make_branch_term(&args.names))); .start_transaction(&format!("track remote {}", make_branch_term(&names)));
for name in &args.names { for name in &names {
tx.mut_repo() tx.mut_repo()
.track_remote_branch(&name.branch, &name.remote); .track_remote_branch(&name.branch, &name.remote);
} }
@ -428,22 +431,24 @@ fn cmd_branch_untrack(
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?; let mut workspace_command = command.workspace_helper(ui)?;
let view = workspace_command.repo().view(); let view = workspace_command.repo().view();
let mut names = Vec::new();
for name in &args.names { for name in &args.names {
if name.remote == git::REMOTE_NAME_FOR_LOCAL_GIT_REPO {
// This restriction can be lifted if we want to support untracked @git branches.
return Err(user_error("Git-tracking branch cannot be untracked"));
}
let remote_ref = view.get_remote_branch(&name.branch, &name.remote); let remote_ref = view.get_remote_branch(&name.branch, &name.remote);
if remote_ref.is_absent() { if remote_ref.is_absent() {
return Err(user_error(format!("No such remote branch: {name}"))); return Err(user_error(format!("No such remote branch: {name}")));
} }
if !remote_ref.is_tracking() { if name.remote == git::REMOTE_NAME_FOR_LOCAL_GIT_REPO {
return Err(user_error(format!("Remote branch not tracked yet: {name}"))); // This restriction can be lifted if we want to support untracked @git branches.
writeln!(ui.warning(), "Git-tracking branch cannot be untracked: {name}")?;
} else if !remote_ref.is_tracking() {
writeln!(ui.warning(), "Remote branch not tracked yet: {name}")?;
} else {
names.push(name.clone());
} }
} }
let mut tx = workspace_command let mut tx = workspace_command
.start_transaction(&format!("untrack remote {}", make_branch_term(&args.names))); .start_transaction(&format!("untrack remote {}", make_branch_term(&names)));
for name in &args.names { for name in &names {
tx.mut_repo() tx.mut_repo()
.untrack_remote_branch(&name.branch, &name.remote); .untrack_remote_branch(&name.branch, &name.remote);
} }

29
cli/tests/test_branch_command.rs
View file

@ -720,22 +720,33 @@ fn test_branch_track_untrack_bad_branches() {
// Track already tracked branch // Track already tracked branch
test_env.jj_cmd_ok(&repo_path, &["branch", "track", "feature1@origin"]); test_env.jj_cmd_ok(&repo_path, &["branch", "track", "feature1@origin"]);
insta::assert_snapshot!( let (_, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "track", "feature1@origin"]);
test_env.jj_cmd_failure(&repo_path, &["branch", "track", "feature1@origin"]), @r###" insta::assert_snapshot!(stderr, @r###"
Error: Remote branch already tracked: feature1@origin Remote branch already tracked: feature1@origin
Nothing changed.
"###); "###);
// Untrack non-tracking branch // Untrack non-tracking branch
insta::assert_snapshot!( let (_, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "untrack", "feature2@origin"]);
test_env.jj_cmd_failure(&repo_path, &["branch", "untrack", "feature2@origin"]), @r###" insta::assert_snapshot!(stderr, @r###"
Error: Remote branch not tracked yet: feature2@origin Remote branch not tracked yet: feature2@origin
Nothing changed.
"###); "###);
// Untrack Git-tracking branch // Untrack Git-tracking branch
test_env.jj_cmd_ok(&repo_path, &["git", "export"]); test_env.jj_cmd_ok(&repo_path, &["git", "export"]);
insta::assert_snapshot!( let (_, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "untrack", "main@git"]);
test_env.jj_cmd_failure(&repo_path, &["branch", "untrack", "main@git"]), @r###" insta::assert_snapshot!(stderr, @r###"
Error: Git-tracking branch cannot be untracked Git-tracking branch cannot be untracked: main@git
Nothing changed.
"###);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
feature1: omvolwpu 1336caed commit
@git: omvolwpu 1336caed commit
@origin: omvolwpu 1336caed commit
feature2@origin: omvolwpu 1336caed commit
main: qpvuntsm 230dd059 (empty) (no description set)
@git: qpvuntsm 230dd059 (empty) (no description set)
"###); "###);
} }