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

revset: don't resolve deleted branch symbol to empty set

Browse source 
A deleted branch disappears immediately if there's no remote counterpart,
so I don't think a local name should be resolvable like zombie.
This commit is contained in:
Yuya Nishihara 2023-07-02 09:59:34 +09:00
parent 5c1352d31c
commit 4a5060a618
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/revset.rs
View file

@ -1641,24 +1641,17 @@ fn resolve_git_ref(repo: &dyn Repo, symbol: &str) -> Option<Vec<CommitId>> {
}
fn resolve_branch(repo: &dyn Repo, symbol: &str) -> Option<Vec<CommitId>> {
if let Some(branch_target) = repo.view().branches().get(symbol) {
return Some(
branch_target
.local_target
.as_ref()
.map(|target| target.adds().to_vec())
.unwrap_or_default(),
);
let view = repo.view();
if let Some(target) = view.get_local_branch(symbol) {
return Some(target.adds().to_vec());
}
if let Some((name, remote_name)) = symbol.split_once('@') {
if let Some(branch_target) = repo.view().branches().get(name) {
if let Some(target) = branch_target.remote_targets.get(remote_name) {
return Some(target.adds().to_vec());
}
if let Some(target) = view.get_remote_branch(name, remote_name) {
return Some(target.adds().to_vec());
}
// A remote with name "git" will shadow local-git tracking branches
if remote_name == "git" {
if let Some(target) = get_local_git_tracking_branch(repo.view(), name) {
if let Some(target) = get_local_git_tracking_branch(view, name) {
return Some(target.adds().to_vec());
}
}

15
lib/tests/test_revset.rs
View file

@ -478,10 +478,17 @@ fn test_resolve_symbol_branches() {
"###);
// Remote only (or locally deleted)
assert_eq!(
resolve_symbol(mut_repo, "remote", None).unwrap(),
vec![], // TODO: NoSuchRevision
);
// TODO: shouldn't suggest deleted local branch
insta::assert_debug_snapshot!(
resolve_symbol(mut_repo, "remote", None).unwrap_err(), @r###"
NoSuchRevision {
name: "remote",
candidates: [
"remote",
"remote-conflicted",
],
}
"###);
assert_eq!(
resolve_symbol(mut_repo, "remote@origin", None).unwrap(),
vec![commit2.id().clone()],

8
tests/test_branch_command.rs
View file

@ -500,6 +500,8 @@ fn test_branch_list_filtered_by_revset() {
"###);
let query = |revset| test_env.jj_cmd_success(&local_path, &["branch", "list", "-r", revset]);
let query_error =
|revset| test_env.jj_cmd_failure(&local_path, &["branch", "list", "-r", revset]);
// "all()" doesn't include deleted branches since they have no local targets.
// So "all()" is identical to "branches()".
@ -526,7 +528,11 @@ fn test_branch_list_filtered_by_revset() {
"###);
// Can't select deleted branch.
insta::assert_snapshot!(query("remote-delete"), @r###"
insta::assert_snapshot!(query("branches(remote-delete)"), @r###"
"###);
insta::assert_snapshot!(query_error("remote-delete"), @r###"
Error: Revision "remote-delete" doesn't exist
Hint: Did you mean "remote-delete", "remote-keep", "remote-rewrite"?
"###);
}