mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-11 06:42:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

tests: rewrite "@"/"root" revset resolution tests without using bad git refs

Browse source
This commit is contained in:
Yuya Nishihara 2023-09-10 20:18:02 +09:00
parent 86206e83a4
commit b80d04319d
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/tests/test_revset.rs
View file

@ -619,6 +619,22 @@ fn test_resolve_symbol_tags() {
resolve_symbol(mut_repo, "unimported"), resolve_symbol(mut_repo, "unimported"),
Err(RevsetResolutionError::NoSuchRevision { .. }) Err(RevsetResolutionError::NoSuchRevision { .. })
); );
// "@" (quoted) can be resolved, and root is a normal symbol.
let ws_id = WorkspaceId::default();
mut_repo
.set_wc_commit(ws_id.clone(), commit1.id().clone())
.unwrap();
mut_repo.set_tag_target("@", RefTarget::normal(commit2.id().clone()));
mut_repo.set_tag_target("root", RefTarget::normal(commit3.id().clone()));
assert_eq!(
resolve_symbol(mut_repo, r#""@""#).unwrap(),
vec![commit2.id().clone()]
);
assert_eq!(
resolve_symbol(mut_repo, "root").unwrap(),
vec![commit3.id().clone()]
);
} }
#[test] #[test]
@ -753,22 +769,6 @@ fn test_resolve_symbol_git_refs() {
Err(RevsetResolutionError::NoSuchRevision { .. }) Err(RevsetResolutionError::NoSuchRevision { .. })
); );
// "@" (quoted) can be resolved, and root is a normal symbol.
let ws_id = WorkspaceId::default();
mut_repo
.set_wc_commit(ws_id.clone(), commit1.id().clone())
.unwrap();
mut_repo.set_git_ref_target("@", RefTarget::normal(commit2.id().clone()));
mut_repo.set_git_ref_target("root", RefTarget::normal(commit3.id().clone()));
assert_eq!(
resolve_symbol(mut_repo, r#""@""#).unwrap(),
vec![commit2.id().clone()]
);
assert_eq!(
resolve_symbol(mut_repo, "root").unwrap(),
vec![commit3.id().clone()]
);
// Conflicted ref resolves to its "adds" // Conflicted ref resolves to its "adds"
assert_eq!( assert_eq!(
resolve_symbol(mut_repo, "refs/heads/conflicted").unwrap(), resolve_symbol(mut_repo, "refs/heads/conflicted").unwrap(),