mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-23 15:00:17 +00:00
tests: move ChangeIdIndex test from test_revset to test_index
This commit is contained in:
Martin von Zweigbergk
Martin von Zweigbergk
parent
1508f28567
commit
2f4594540a
2 changed files with 110 additions and 109 deletions
|
|
@ -16,7 +16,7 @@ use std::fs;
|
|||
use std::sync::Arc;
|
||||
|
||||
use assert_matches::assert_matches;
|
||||
use jj_lib::backend::CommitId;
|
||||
use jj_lib::backend::{ChangeId, CommitId};
|
||||
use jj_lib::commit::Commit;
|
||||
use jj_lib::commit_builder::CommitBuilder;
|
||||
use jj_lib::default_index::{
|
||||
|
|
@ -24,8 +24,9 @@ use jj_lib::default_index::{
|
|||
DefaultMutableIndex, DefaultReadonlyIndex, IndexPosition,
|
||||
};
|
||||
use jj_lib::index::Index as _;
|
||||
use jj_lib::object_id::ObjectId as _;
|
||||
use jj_lib::object_id::{HexPrefix, ObjectId as _, PrefixResolution};
|
||||
use jj_lib::repo::{MutableRepo, ReadonlyRepo, Repo};
|
||||
use jj_lib::revset::RevsetExpression;
|
||||
use jj_lib::settings::UserSettings;
|
||||
use testutils::test_backend::TestBackend;
|
||||
use testutils::{
|
||||
|
|
@ -642,3 +643,108 @@ fn test_index_store_type() {
|
|||
);
|
||||
assert_eq!(as_readonly_composite(&repo).num_commits(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_change_id_index() {
|
||||
let settings = testutils::user_settings();
|
||||
let test_repo = TestRepo::init();
|
||||
let repo = &test_repo.repo;
|
||||
|
||||
let mut tx = repo.start_transaction(&settings);
|
||||
|
||||
let root_commit = repo.store().root_commit();
|
||||
let mut commit_number = 0;
|
||||
let mut commit_with_change_id = |change_id| {
|
||||
commit_number += 1;
|
||||
tx.mut_repo()
|
||||
.new_commit(
|
||||
&settings,
|
||||
vec![root_commit.id().clone()],
|
||||
root_commit.tree_id().clone(),
|
||||
)
|
||||
.set_change_id(ChangeId::from_hex(change_id))
|
||||
.set_description(format!("commit {commit_number}"))
|
||||
.write()
|
||||
.unwrap()
|
||||
};
|
||||
let commit_1 = commit_with_change_id("abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
let commit_2 = commit_with_change_id("aaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
let commit_3 = commit_with_change_id("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
|
||||
let commit_4 = commit_with_change_id("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
let commit_5 = commit_with_change_id("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
|
||||
let index_for_heads = |commits: &[&Commit]| {
|
||||
RevsetExpression::commits(commits.iter().map(|commit| commit.id().clone()).collect())
|
||||
.ancestors()
|
||||
.evaluate_programmatic(tx.repo())
|
||||
.unwrap()
|
||||
.change_id_index()
|
||||
};
|
||||
let change_id_index = index_for_heads(&[&commit_1, &commit_2, &commit_3, &commit_4, &commit_5]);
|
||||
let prefix_len =
|
||||
|commit: &Commit| change_id_index.shortest_unique_prefix_len(commit.change_id());
|
||||
assert_eq!(prefix_len(&root_commit), 1);
|
||||
assert_eq!(prefix_len(&commit_1), 2);
|
||||
assert_eq!(prefix_len(&commit_2), 6);
|
||||
assert_eq!(prefix_len(&commit_3), 6);
|
||||
assert_eq!(prefix_len(&commit_4), 1);
|
||||
assert_eq!(prefix_len(&commit_5), 1);
|
||||
let resolve_prefix =
|
||||
|prefix: &str| change_id_index.resolve_prefix(&HexPrefix::new(prefix).unwrap());
|
||||
// Ambiguous matches
|
||||
assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch);
|
||||
assert_eq!(resolve_prefix("aaaaa"), PrefixResolution::AmbiguousMatch);
|
||||
// Exactly the necessary length
|
||||
assert_eq!(
|
||||
resolve_prefix("0"),
|
||||
PrefixResolution::SingleMatch(vec![root_commit.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("aaaaaa"),
|
||||
PrefixResolution::SingleMatch(vec![commit_3.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("aaaaab"),
|
||||
PrefixResolution::SingleMatch(vec![commit_2.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("ab"),
|
||||
PrefixResolution::SingleMatch(vec![commit_1.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("b"),
|
||||
PrefixResolution::SingleMatch(vec![commit_5.id().clone(), commit_4.id().clone()])
|
||||
);
|
||||
// Longer than necessary
|
||||
assert_eq!(
|
||||
resolve_prefix("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
|
||||
PrefixResolution::SingleMatch(vec![commit_3.id().clone()])
|
||||
);
|
||||
// No match
|
||||
assert_eq!(resolve_prefix("ba"), PrefixResolution::NoMatch);
|
||||
|
||||
// Test with a revset containing only some of the commits. We should get shorter
|
||||
// prefixes and be able to resolve shorter prefixes.
|
||||
let change_id_index = index_for_heads(&[&commit_1, &commit_2]);
|
||||
let prefix_len =
|
||||
|commit: &Commit| change_id_index.shortest_unique_prefix_len(commit.change_id());
|
||||
assert_eq!(prefix_len(&commit_1), 2);
|
||||
assert_eq!(prefix_len(&commit_2), 2);
|
||||
assert_eq!(prefix_len(&commit_3), 6);
|
||||
let resolve_prefix =
|
||||
|prefix: &str| change_id_index.resolve_prefix(&HexPrefix::new(prefix).unwrap());
|
||||
assert_eq!(
|
||||
resolve_prefix("0"),
|
||||
PrefixResolution::SingleMatch(vec![root_commit.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("aa"),
|
||||
PrefixResolution::SingleMatch(vec![commit_2.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("ab"),
|
||||
PrefixResolution::SingleMatch(vec![commit_1.id().clone()])
|
||||
);
|
||||
assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch);
|
||||
assert_eq!(resolve_prefix("b"), PrefixResolution::NoMatch);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ use std::path::Path;
|
|||
|
||||
use assert_matches::assert_matches;
|
||||
use itertools::Itertools;
|
||||
use jj_lib::backend::{ChangeId, CommitId, MillisSinceEpoch, Signature, Timestamp};
|
||||
use jj_lib::backend::{CommitId, MillisSinceEpoch, Signature, Timestamp};
|
||||
use jj_lib::commit::Commit;
|
||||
use jj_lib::git;
|
||||
use jj_lib::git_backend::GitBackend;
|
||||
use jj_lib::object_id::{HexPrefix, ObjectId, PrefixResolution};
|
||||
use jj_lib::object_id::ObjectId;
|
||||
use jj_lib::op_store::{RefTarget, RemoteRef, RemoteRefState, WorkspaceId};
|
||||
use jj_lib::repo::Repo;
|
||||
use jj_lib::repo_path::RepoPath;
|
||||
|
|
@ -2782,111 +2782,6 @@ fn test_reverse_graph_iterator() {
|
|||
assert_eq!(commits[4].1, vec![]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_change_id_index() {
|
||||
let settings = testutils::user_settings();
|
||||
let test_repo = TestRepo::init();
|
||||
let repo = &test_repo.repo;
|
||||
|
||||
let mut tx = repo.start_transaction(&settings);
|
||||
|
||||
let root_commit = repo.store().root_commit();
|
||||
let mut commit_number = 0;
|
||||
let mut commit_with_change_id = |change_id| {
|
||||
commit_number += 1;
|
||||
tx.mut_repo()
|
||||
.new_commit(
|
||||
&settings,
|
||||
vec![root_commit.id().clone()],
|
||||
root_commit.tree_id().clone(),
|
||||
)
|
||||
.set_change_id(ChangeId::from_hex(change_id))
|
||||
.set_description(format!("commit {commit_number}"))
|
||||
.write()
|
||||
.unwrap()
|
||||
};
|
||||
let commit_1 = commit_with_change_id("abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
let commit_2 = commit_with_change_id("aaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
let commit_3 = commit_with_change_id("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
|
||||
let commit_4 = commit_with_change_id("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
let commit_5 = commit_with_change_id("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
|
||||
|
||||
let index_for_heads = |commits: &[&Commit]| {
|
||||
RevsetExpression::commits(commits.iter().map(|commit| commit.id().clone()).collect())
|
||||
.ancestors()
|
||||
.evaluate_programmatic(tx.repo())
|
||||
.unwrap()
|
||||
.change_id_index()
|
||||
};
|
||||
let change_id_index = index_for_heads(&[&commit_1, &commit_2, &commit_3, &commit_4, &commit_5]);
|
||||
let prefix_len =
|
||||
|commit: &Commit| change_id_index.shortest_unique_prefix_len(commit.change_id());
|
||||
assert_eq!(prefix_len(&root_commit), 1);
|
||||
assert_eq!(prefix_len(&commit_1), 2);
|
||||
assert_eq!(prefix_len(&commit_2), 6);
|
||||
assert_eq!(prefix_len(&commit_3), 6);
|
||||
assert_eq!(prefix_len(&commit_4), 1);
|
||||
assert_eq!(prefix_len(&commit_5), 1);
|
||||
let resolve_prefix =
|
||||
|prefix: &str| change_id_index.resolve_prefix(&HexPrefix::new(prefix).unwrap());
|
||||
// Ambiguous matches
|
||||
assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch);
|
||||
assert_eq!(resolve_prefix("aaaaa"), PrefixResolution::AmbiguousMatch);
|
||||
// Exactly the necessary length
|
||||
assert_eq!(
|
||||
resolve_prefix("0"),
|
||||
PrefixResolution::SingleMatch(vec![root_commit.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("aaaaaa"),
|
||||
PrefixResolution::SingleMatch(vec![commit_3.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("aaaaab"),
|
||||
PrefixResolution::SingleMatch(vec![commit_2.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("ab"),
|
||||
PrefixResolution::SingleMatch(vec![commit_1.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("b"),
|
||||
PrefixResolution::SingleMatch(vec![commit_5.id().clone(), commit_4.id().clone()])
|
||||
);
|
||||
// Longer than necessary
|
||||
assert_eq!(
|
||||
resolve_prefix("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
|
||||
PrefixResolution::SingleMatch(vec![commit_3.id().clone()])
|
||||
);
|
||||
// No match
|
||||
assert_eq!(resolve_prefix("ba"), PrefixResolution::NoMatch);
|
||||
|
||||
// Test with a revset containing only some of the commits. We should get shorter
|
||||
// prefixes and be able to resolve shorter prefixes.
|
||||
let change_id_index = index_for_heads(&[&commit_1, &commit_2]);
|
||||
let prefix_len =
|
||||
|commit: &Commit| change_id_index.shortest_unique_prefix_len(commit.change_id());
|
||||
assert_eq!(prefix_len(&commit_1), 2);
|
||||
assert_eq!(prefix_len(&commit_2), 2);
|
||||
assert_eq!(prefix_len(&commit_3), 6);
|
||||
let resolve_prefix =
|
||||
|prefix: &str| change_id_index.resolve_prefix(&HexPrefix::new(prefix).unwrap());
|
||||
assert_eq!(
|
||||
resolve_prefix("0"),
|
||||
PrefixResolution::SingleMatch(vec![root_commit.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("aa"),
|
||||
PrefixResolution::SingleMatch(vec![commit_2.id().clone()])
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_prefix("ab"),
|
||||
PrefixResolution::SingleMatch(vec![commit_1.id().clone()])
|
||||
);
|
||||
assert_eq!(resolve_prefix("a"), PrefixResolution::AmbiguousMatch);
|
||||
assert_eq!(resolve_prefix("b"), PrefixResolution::NoMatch);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_no_such_revision_suggestion() {
|
||||
let settings = testutils::user_settings();
|
||||
|
|
|
|||
Loading…
Reference in a new issue