forked from mirrors/jj
a757fddcf1
Since fileset and revset languages are syntactically close, we can reparse
revset expression as a fileset. This might sound a bit scary, but helps
eliminate nested quoting like file("~glob:'*.rs'"). One oddity exists in alias
substitution, though. Another possible problem is that we'll need to add fake
operator parsing rules if we introduce incompatibility in fileset, or want to
embed revset expressions in a fileset.
Since "file(x, y)" is equivalent to "file(x|y)", the former will be deprecated.
I'll probably add a mechanism to collect warnings during parsing.
3152 lines
99 KiB
Rust
3152 lines
99 KiB
Rust
// Copyright 2021 The Jujutsu Authors
|
||
//
|
||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||
// you may not use this file except in compliance with the License.
|
||
// You may obtain a copy of the License at
|
||
//
|
||
// https://www.apache.org/licenses/LICENSE-2.0
|
||
//
|
||
// Unless required by applicable law or agreed to in writing, software
|
||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||
// See the License for the specific language governing permissions and
|
||
// limitations under the License.
|
||
|
||
use std::iter;
|
||
use std::path::Path;
|
||
|
||
use assert_matches::assert_matches;
|
||
use itertools::Itertools;
|
||
use jj_lib::backend::{CommitId, MillisSinceEpoch, Signature, Timestamp};
|
||
use jj_lib::commit::Commit;
|
||
use jj_lib::fileset::FilesetExpression;
|
||
use jj_lib::git;
|
||
use jj_lib::git_backend::GitBackend;
|
||
use jj_lib::graph::{GraphEdge, ReverseGraphIterator};
|
||
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, RepoPathUiConverter};
|
||
use jj_lib::revset::{
|
||
optimize, parse, DefaultSymbolResolver, FailingSymbolResolver, ResolvedExpression, Revset,
|
||
RevsetAliasesMap, RevsetExpression, RevsetExtensions, RevsetFilterPredicate,
|
||
RevsetParseContext, RevsetResolutionError, RevsetWorkspaceContext, SymbolResolverExtension,
|
||
};
|
||
use jj_lib::settings::GitSettings;
|
||
use jj_lib::workspace::Workspace;
|
||
use test_case::test_case;
|
||
use testutils::{
|
||
create_random_commit, create_tree, write_random_commit, CommitGraphBuilder, TestRepo,
|
||
TestRepoBackend, TestWorkspace,
|
||
};
|
||
|
||
fn resolve_symbol_with_extensions(
|
||
repo: &dyn Repo,
|
||
extensions: &RevsetExtensions,
|
||
symbol: &str,
|
||
) -> Result<Vec<CommitId>, RevsetResolutionError> {
|
||
let aliases_map = RevsetAliasesMap::default();
|
||
let context = RevsetParseContext::new(&aliases_map, String::new(), extensions, None);
|
||
let expression = parse(symbol, &context).unwrap();
|
||
assert_matches!(*expression, RevsetExpression::CommitRef(_));
|
||
let symbol_resolver = DefaultSymbolResolver::new(repo, extensions.symbol_resolvers());
|
||
match expression.resolve_user_expression(repo, &symbol_resolver)? {
|
||
ResolvedExpression::Commits(commits) => Ok(commits),
|
||
expression => panic!("symbol resolved to compound expression: {expression:?}"),
|
||
}
|
||
}
|
||
|
||
fn resolve_symbol(repo: &dyn Repo, symbol: &str) -> Result<Vec<CommitId>, RevsetResolutionError> {
|
||
resolve_symbol_with_extensions(repo, &RevsetExtensions::default(), symbol)
|
||
}
|
||
|
||
fn revset_for_commits<'index>(
|
||
repo: &'index dyn Repo,
|
||
commits: &[&Commit],
|
||
) -> Box<dyn Revset + 'index> {
|
||
let symbol_resolver =
|
||
DefaultSymbolResolver::new(repo, &([] as [&Box<dyn SymbolResolverExtension>; 0]));
|
||
RevsetExpression::commits(commits.iter().map(|commit| commit.id().clone()).collect())
|
||
.resolve_user_expression(repo, &symbol_resolver)
|
||
.unwrap()
|
||
.evaluate(repo)
|
||
.unwrap()
|
||
}
|
||
|
||
#[test]
|
||
fn test_resolve_symbol_empty_string() {
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
assert_matches!(
|
||
resolve_symbol(repo.as_ref(), r#""""#),
|
||
Err(RevsetResolutionError::EmptyString)
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_resolve_symbol_commit_id() {
|
||
let settings = testutils::user_settings();
|
||
// Test only with git so we can get predictable commit ids
|
||
let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git);
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let signature = Signature {
|
||
name: "test".to_string(),
|
||
email: "test".to_string(),
|
||
timestamp: Timestamp {
|
||
timestamp: MillisSinceEpoch(0),
|
||
tz_offset: 0,
|
||
},
|
||
};
|
||
|
||
let mut commits = vec![];
|
||
for i in &[1, 167, 895] {
|
||
let commit = mut_repo
|
||
.new_commit(
|
||
&settings,
|
||
vec![repo.store().root_commit_id().clone()],
|
||
repo.store().empty_merged_tree_id(),
|
||
)
|
||
.set_description(format!("test {i}"))
|
||
.set_author(signature.clone())
|
||
.set_committer(signature.clone())
|
||
.write()
|
||
.unwrap();
|
||
commits.push(commit);
|
||
}
|
||
let repo = tx.commit("test");
|
||
|
||
// Test the test setup
|
||
assert_eq!(
|
||
commits[0].id().hex(),
|
||
"0454de3cae04c46cda37ba2e8873b4c17ff51dcb"
|
||
);
|
||
assert_eq!(
|
||
commits[1].id().hex(),
|
||
"045f56cd1b17e8abde86771e2705395dcde6a957"
|
||
);
|
||
assert_eq!(
|
||
commits[2].id().hex(),
|
||
"0468f7da8de2ce442f512aacf83411d26cd2e0cf"
|
||
);
|
||
|
||
// Change ids should never have prefix "04"
|
||
insta::assert_snapshot!(commits[0].change_id().hex(), @"781199f9d55d18e855a7aa84c5e4b40d");
|
||
insta::assert_snapshot!(commits[1].change_id().hex(), @"a2c96fc88f32e487328f04927f20c4b1");
|
||
insta::assert_snapshot!(commits[2].change_id().hex(), @"4399e4f3123763dfe7d68a2809ecc01b");
|
||
|
||
// Test lookup by full commit id
|
||
assert_eq!(
|
||
resolve_symbol(repo.as_ref(), "0454de3cae04c46cda37ba2e8873b4c17ff51dcb",).unwrap(),
|
||
vec![commits[0].id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(repo.as_ref(), "045f56cd1b17e8abde86771e2705395dcde6a957",).unwrap(),
|
||
vec![commits[1].id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(repo.as_ref(), "0468f7da8de2ce442f512aacf83411d26cd2e0cf",).unwrap(),
|
||
vec![commits[2].id().clone()]
|
||
);
|
||
|
||
// Test commit id prefix
|
||
assert_eq!(
|
||
resolve_symbol(repo.as_ref(), "046").unwrap(),
|
||
vec![commits[2].id().clone()]
|
||
);
|
||
assert_matches!(
|
||
resolve_symbol(repo.as_ref(), "04"),
|
||
Err(RevsetResolutionError::AmbiguousCommitIdPrefix(s)) if s == "04"
|
||
);
|
||
assert_matches!(
|
||
resolve_symbol(repo.as_ref(), "040"),
|
||
Err(RevsetResolutionError::NoSuchRevision{name, candidates}) if name == "040" && candidates.is_empty()
|
||
);
|
||
|
||
// Test non-hex string
|
||
assert_matches!(
|
||
resolve_symbol(repo.as_ref(), "foo"),
|
||
Err(RevsetResolutionError::NoSuchRevision{name, candidates}) if name == "foo" && candidates.is_empty()
|
||
);
|
||
|
||
// Test present() suppresses only NoSuchRevision error
|
||
assert_eq!(resolve_commit_ids(repo.as_ref(), "present(foo)"), []);
|
||
let symbol_resolver = DefaultSymbolResolver::new(
|
||
repo.as_ref(),
|
||
&([] as [&Box<dyn SymbolResolverExtension>; 0]),
|
||
);
|
||
let aliases_map = RevsetAliasesMap::default();
|
||
let extensions = RevsetExtensions::default();
|
||
let context = RevsetParseContext::new(&aliases_map, settings.user_email(), &extensions, None);
|
||
assert_matches!(
|
||
optimize(parse("present(04)", &context).unwrap()).resolve_user_expression(repo.as_ref(), &symbol_resolver),
|
||
Err(RevsetResolutionError::AmbiguousCommitIdPrefix(s)) if s == "04"
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(repo.as_ref(), "present(046)"),
|
||
vec![commits[2].id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test_case(false ; "mutable")]
|
||
#[test_case(true ; "readonly")]
|
||
fn test_resolve_symbol_change_id(readonly: bool) {
|
||
let settings = testutils::user_settings();
|
||
let git_settings = GitSettings::default();
|
||
// Test only with git so we can get predictable change ids
|
||
let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git);
|
||
let repo = &test_repo.repo;
|
||
|
||
let git_repo = repo
|
||
.store()
|
||
.backend_impl()
|
||
.downcast_ref::<GitBackend>()
|
||
.unwrap()
|
||
.open_git_repo()
|
||
.unwrap();
|
||
// Add some commits that will end up having change ids with common prefixes
|
||
let empty_tree_id = git_repo.treebuilder(None).unwrap().write().unwrap();
|
||
let git_author = git2::Signature::new(
|
||
"git author",
|
||
"git.author@example.com",
|
||
&git2::Time::new(1000, 60),
|
||
)
|
||
.unwrap();
|
||
let git_committer = git2::Signature::new(
|
||
"git committer",
|
||
"git.committer@example.com",
|
||
&git2::Time::new(2000, -480),
|
||
)
|
||
.unwrap();
|
||
let git_tree = git_repo.find_tree(empty_tree_id).unwrap();
|
||
let mut git_commit_ids = vec![];
|
||
for i in &[133, 664, 840, 5085] {
|
||
let git_commit_id = git_repo
|
||
.commit(
|
||
Some(&format!("refs/heads/branch{i}")),
|
||
&git_author,
|
||
&git_committer,
|
||
&format!("test {i}"),
|
||
&git_tree,
|
||
&[],
|
||
)
|
||
.unwrap();
|
||
git_commit_ids.push(git_commit_id);
|
||
}
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
git::import_refs(tx.mut_repo(), &git_settings).unwrap();
|
||
|
||
// Test the test setup
|
||
assert_eq!(
|
||
hex::encode(git_commit_ids[0]),
|
||
// "04e12a5467bba790efb88a9870894ec208b16bf1" reversed
|
||
"8fd68d104372910e19511df709e5dde62a548720"
|
||
);
|
||
assert_eq!(
|
||
hex::encode(git_commit_ids[1]),
|
||
// "040b3ba3a51d8edbc4c5855cbd09de71d4c29cca" reversed
|
||
"5339432b8e7b90bd3aa1a323db71b8a5c5dcd020"
|
||
);
|
||
assert_eq!(
|
||
hex::encode(git_commit_ids[2]),
|
||
// "04e1c7082e4e34f3f371d8a1a46770b861b9b547" reversed
|
||
"e2ad9d861d0ee625851b8ecfcf2c727410e38720"
|
||
);
|
||
assert_eq!(
|
||
hex::encode(git_commit_ids[3]),
|
||
// "911d7e52fd5ba04b8f289e14c3d30b52d38c0020" reversed
|
||
"040031cb4ad0cbc3287914f1d205dabf4a7eb889"
|
||
);
|
||
|
||
let _readonly_repo;
|
||
let repo: &dyn Repo = if readonly {
|
||
_readonly_repo = tx.commit("test");
|
||
_readonly_repo.as_ref()
|
||
} else {
|
||
tx.mut_repo()
|
||
};
|
||
|
||
// Test lookup by full change id
|
||
assert_eq!(
|
||
resolve_symbol(repo, "zvlyxpuvtsoopsqzlkorrpqrszrqvlnx").unwrap(),
|
||
vec![CommitId::from_hex(
|
||
"8fd68d104372910e19511df709e5dde62a548720"
|
||
)]
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(repo, "zvzowopwpuymrlmonvnuruunomzqmlsy").unwrap(),
|
||
vec![CommitId::from_hex(
|
||
"5339432b8e7b90bd3aa1a323db71b8a5c5dcd020"
|
||
)]
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(repo, "zvlynszrxlvlwvkwkwsymrpypvtsszor").unwrap(),
|
||
vec![CommitId::from_hex(
|
||
"e2ad9d861d0ee625851b8ecfcf2c727410e38720"
|
||
)]
|
||
);
|
||
|
||
// Test change id prefix
|
||
assert_eq!(
|
||
resolve_symbol(repo, "zvlyx").unwrap(),
|
||
vec![CommitId::from_hex(
|
||
"8fd68d104372910e19511df709e5dde62a548720"
|
||
)]
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(repo, "zvlyn").unwrap(),
|
||
vec![CommitId::from_hex(
|
||
"e2ad9d861d0ee625851b8ecfcf2c727410e38720"
|
||
)]
|
||
);
|
||
assert_matches!(
|
||
resolve_symbol(repo, "zvly"),
|
||
Err(RevsetResolutionError::AmbiguousChangeIdPrefix(s)) if s == "zvly"
|
||
);
|
||
assert_matches!(
|
||
resolve_symbol(repo, "zvlyw"),
|
||
Err(RevsetResolutionError::NoSuchRevision{name, candidates}) if name == "zvlyw" && candidates.is_empty()
|
||
);
|
||
|
||
// Test that commit and changed id don't conflict ("040" and "zvz" are the
|
||
// same).
|
||
assert_eq!(
|
||
resolve_symbol(repo, "040").unwrap(),
|
||
vec![CommitId::from_hex(
|
||
"040031cb4ad0cbc3287914f1d205dabf4a7eb889"
|
||
)]
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(repo, "zvz").unwrap(),
|
||
vec![CommitId::from_hex(
|
||
"5339432b8e7b90bd3aa1a323db71b8a5c5dcd020"
|
||
)]
|
||
);
|
||
|
||
// Test non-hex string
|
||
assert_matches!(
|
||
resolve_symbol(repo, "foo"),
|
||
Err(RevsetResolutionError::NoSuchRevision{
|
||
name,
|
||
candidates
|
||
}) if name == "foo" && candidates.is_empty()
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_resolve_working_copy() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
|
||
let ws1 = WorkspaceId::new("ws1".to_string());
|
||
let ws2 = WorkspaceId::new("ws2".to_string());
|
||
|
||
// Cannot resolve a working-copy commit for an unknown workspace
|
||
assert_matches!(
|
||
RevsetExpression::working_copy(ws1.clone())
|
||
.resolve_user_expression(mut_repo, &FailingSymbolResolver),
|
||
Err(RevsetResolutionError::WorkspaceMissingWorkingCopy { name }) if name == "ws1"
|
||
);
|
||
|
||
// Add some workspaces
|
||
mut_repo
|
||
.set_wc_commit(ws1.clone(), commit1.id().clone())
|
||
.unwrap();
|
||
mut_repo
|
||
.set_wc_commit(ws2.clone(), commit2.id().clone())
|
||
.unwrap();
|
||
let resolve = |ws_id: WorkspaceId| -> Vec<CommitId> {
|
||
RevsetExpression::working_copy(ws_id)
|
||
.evaluate_programmatic(mut_repo)
|
||
.unwrap()
|
||
.iter()
|
||
.collect()
|
||
};
|
||
|
||
// Can resolve "@" shorthand with a default workspace ID
|
||
assert_eq!(resolve(ws1), vec![commit1.id().clone()]);
|
||
// Can resolve an explicit checkout
|
||
assert_eq!(resolve(ws2), vec![commit2.id().clone()]);
|
||
}
|
||
|
||
#[test]
|
||
fn test_resolve_working_copies() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
|
||
// Add some workspaces
|
||
let ws1 = WorkspaceId::new("ws1".to_string());
|
||
let ws2 = WorkspaceId::new("ws2".to_string());
|
||
|
||
// add one commit to each working copy
|
||
mut_repo
|
||
.set_wc_commit(ws1.clone(), commit1.id().clone())
|
||
.unwrap();
|
||
mut_repo
|
||
.set_wc_commit(ws2.clone(), commit2.id().clone())
|
||
.unwrap();
|
||
let resolve = || -> Vec<CommitId> {
|
||
RevsetExpression::working_copies()
|
||
.evaluate_programmatic(mut_repo)
|
||
.unwrap()
|
||
.iter()
|
||
.collect()
|
||
};
|
||
|
||
// ensure our output has those two commits
|
||
assert_eq!(resolve(), vec![commit2.id().clone(), commit1.id().clone()]);
|
||
}
|
||
|
||
#[test]
|
||
fn test_resolve_symbol_branches() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
let new_remote_ref = |target| RemoteRef {
|
||
target,
|
||
state: RemoteRefState::New,
|
||
};
|
||
let tracking_remote_ref = |target| RemoteRef {
|
||
target,
|
||
state: RemoteRefState::Tracking,
|
||
};
|
||
let normal_tracking_remote_ref =
|
||
|id: &CommitId| tracking_remote_ref(RefTarget::normal(id.clone()));
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
let commit3 = write_random_commit(mut_repo, &settings);
|
||
let commit4 = write_random_commit(mut_repo, &settings);
|
||
let commit5 = write_random_commit(mut_repo, &settings);
|
||
|
||
mut_repo.set_local_branch_target("local", RefTarget::normal(commit1.id().clone()));
|
||
mut_repo.set_remote_branch("remote", "origin", normal_tracking_remote_ref(commit2.id()));
|
||
mut_repo.set_local_branch_target("local-remote", RefTarget::normal(commit3.id().clone()));
|
||
mut_repo.set_remote_branch(
|
||
"local-remote",
|
||
"origin",
|
||
normal_tracking_remote_ref(commit4.id()),
|
||
);
|
||
mut_repo.set_local_branch_target(
|
||
"local-remote@origin", // not a remote branch
|
||
RefTarget::normal(commit5.id().clone()),
|
||
);
|
||
mut_repo.set_remote_branch(
|
||
"local-remote",
|
||
"mirror",
|
||
tracking_remote_ref(mut_repo.get_local_branch("local-remote")),
|
||
);
|
||
mut_repo.set_remote_branch(
|
||
"local-remote",
|
||
"untracked",
|
||
new_remote_ref(mut_repo.get_local_branch("local-remote")),
|
||
);
|
||
mut_repo.set_remote_branch(
|
||
"local-remote",
|
||
git::REMOTE_NAME_FOR_LOCAL_GIT_REPO,
|
||
tracking_remote_ref(mut_repo.get_local_branch("local-remote")),
|
||
);
|
||
|
||
mut_repo.set_local_branch_target(
|
||
"local-conflicted",
|
||
RefTarget::from_legacy_form(
|
||
[commit1.id().clone()],
|
||
[commit3.id().clone(), commit2.id().clone()],
|
||
),
|
||
);
|
||
mut_repo.set_remote_branch(
|
||
"remote-conflicted",
|
||
"origin",
|
||
tracking_remote_ref(RefTarget::from_legacy_form(
|
||
[commit3.id().clone()],
|
||
[commit5.id().clone(), commit4.id().clone()],
|
||
)),
|
||
);
|
||
|
||
// Local only
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "local").unwrap(),
|
||
vec![commit1.id().clone()],
|
||
);
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "local@origin").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "local@origin",
|
||
candidates: [
|
||
"local",
|
||
"local-remote@git",
|
||
"local-remote@mirror",
|
||
"local-remote@origin",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
|
||
// Remote only (or locally deleted)
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "remote").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "remote",
|
||
candidates: [
|
||
"remote-conflicted@origin",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "remote@origin").unwrap(),
|
||
vec![commit2.id().clone()],
|
||
);
|
||
|
||
// Local/remote/git
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "local-remote").unwrap(),
|
||
vec![commit3.id().clone()],
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "local-remote@origin").unwrap(),
|
||
vec![commit4.id().clone()],
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, r#""local-remote@origin""#).unwrap(),
|
||
vec![commit5.id().clone()],
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "local-remote@mirror").unwrap(),
|
||
vec![commit3.id().clone()],
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "local-remote@git").unwrap(),
|
||
vec![commit3.id().clone()],
|
||
);
|
||
|
||
// Conflicted
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "local-conflicted").unwrap(),
|
||
vec![commit3.id().clone(), commit2.id().clone()],
|
||
);
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "remote-conflicted@origin").unwrap(),
|
||
vec![commit5.id().clone(), commit4.id().clone()],
|
||
);
|
||
|
||
// Typo of local/remote branch name:
|
||
// For "local-emote" (without @remote part), "local-remote@mirror"/"@git" aren't
|
||
// suggested since they point to the same target as "local-remote". OTOH,
|
||
// "local-remote@untracked" is suggested because non-tracking branch is
|
||
// unrelated to the local branch of the same name.
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "local-emote").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "local-emote",
|
||
candidates: [
|
||
"local",
|
||
"local-conflicted",
|
||
"local-remote",
|
||
"local-remote@origin",
|
||
"local-remote@untracked",
|
||
],
|
||
}
|
||
"###);
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "local-emote@origin").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "local-emote@origin",
|
||
candidates: [
|
||
"local",
|
||
"local-remote",
|
||
"local-remote@git",
|
||
"local-remote@mirror",
|
||
"local-remote@origin",
|
||
"local-remote@untracked",
|
||
"remote-conflicted@origin",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "local-remote@origine").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "local-remote@origine",
|
||
candidates: [
|
||
"local",
|
||
"local-remote",
|
||
"local-remote@git",
|
||
"local-remote@mirror",
|
||
"local-remote@origin",
|
||
"local-remote@untracked",
|
||
"remote-conflicted@origin",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
// "local-remote@mirror" shouldn't be omitted just because it points to the same
|
||
// target as "local-remote".
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "remote@mirror").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "remote@mirror",
|
||
candidates: [
|
||
"local-remote@mirror",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
|
||
// Typo of remote-only branch name
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "emote").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "emote",
|
||
candidates: [
|
||
"remote-conflicted@origin",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "emote@origin").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "emote@origin",
|
||
candidates: [
|
||
"local-remote@origin",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "remote@origine").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "remote@origine",
|
||
candidates: [
|
||
"local-remote@origin",
|
||
"remote-conflicted@origin",
|
||
"remote@origin",
|
||
],
|
||
}
|
||
"###);
|
||
}
|
||
|
||
#[test]
|
||
fn test_resolve_symbol_tags() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
let commit3 = write_random_commit(mut_repo, &settings);
|
||
|
||
mut_repo.set_tag_target("tag-branch", RefTarget::normal(commit1.id().clone()));
|
||
mut_repo.set_local_branch_target("tag-branch", RefTarget::normal(commit2.id().clone()));
|
||
mut_repo.set_git_ref_target(
|
||
"refs/tags/unimported",
|
||
RefTarget::normal(commit3.id().clone()),
|
||
);
|
||
|
||
// Tag precedes branch
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "tag-branch").unwrap(),
|
||
vec![commit1.id().clone()],
|
||
);
|
||
|
||
assert_matches!(
|
||
resolve_symbol(mut_repo, "unimported"),
|
||
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]
|
||
fn test_resolve_symbol_git_head() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
|
||
// Without HEAD@git
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "HEAD").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "HEAD",
|
||
candidates: [],
|
||
}
|
||
"###);
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "HEAD@git").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "HEAD@git",
|
||
candidates: [],
|
||
}
|
||
"###);
|
||
|
||
// With HEAD@git
|
||
mut_repo.set_git_head_target(RefTarget::normal(commit1.id().clone()));
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "HEAD").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "HEAD",
|
||
candidates: [
|
||
"HEAD@git",
|
||
],
|
||
}
|
||
"###);
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "HEAD@git").unwrap(),
|
||
vec![commit1.id().clone()],
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_resolve_symbol_git_refs() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
// Create some commits and refs to work with and so the repo is not empty
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
let commit3 = write_random_commit(mut_repo, &settings);
|
||
let commit4 = write_random_commit(mut_repo, &settings);
|
||
let commit5 = write_random_commit(mut_repo, &settings);
|
||
mut_repo.set_git_ref_target(
|
||
"refs/heads/branch1",
|
||
RefTarget::normal(commit1.id().clone()),
|
||
);
|
||
mut_repo.set_git_ref_target(
|
||
"refs/heads/branch2",
|
||
RefTarget::normal(commit2.id().clone()),
|
||
);
|
||
mut_repo.set_git_ref_target(
|
||
"refs/heads/conflicted",
|
||
RefTarget::from_legacy_form(
|
||
[commit2.id().clone()],
|
||
[commit1.id().clone(), commit3.id().clone()],
|
||
),
|
||
);
|
||
mut_repo.set_git_ref_target("refs/tags/tag1", RefTarget::normal(commit2.id().clone()));
|
||
mut_repo.set_git_ref_target(
|
||
"refs/tags/remotes/origin/branch1",
|
||
RefTarget::normal(commit3.id().clone()),
|
||
);
|
||
|
||
// Nonexistent ref
|
||
assert_matches!(
|
||
resolve_symbol(mut_repo, "nonexistent"),
|
||
Err(RevsetResolutionError::NoSuchRevision{name, candidates})
|
||
if name == "nonexistent" && candidates.is_empty()
|
||
);
|
||
|
||
// Full ref
|
||
mut_repo.set_git_ref_target("refs/heads/branch", RefTarget::normal(commit4.id().clone()));
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "refs/heads/branch").unwrap(),
|
||
vec![commit4.id().clone()]
|
||
);
|
||
|
||
// Qualified with only heads/
|
||
mut_repo.set_git_ref_target("refs/heads/branch", RefTarget::normal(commit5.id().clone()));
|
||
mut_repo.set_git_ref_target("refs/tags/branch", RefTarget::normal(commit4.id().clone()));
|
||
// branch alone is not recognized
|
||
insta::assert_debug_snapshot!(
|
||
resolve_symbol(mut_repo, "branch").unwrap_err(), @r###"
|
||
NoSuchRevision {
|
||
name: "branch",
|
||
candidates: [],
|
||
}
|
||
"###);
|
||
// heads/branch does get resolved to the git ref refs/heads/branch
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "heads/branch").unwrap(),
|
||
vec![commit5.id().clone()]
|
||
);
|
||
|
||
// Unqualified tag name
|
||
mut_repo.set_git_ref_target("refs/tags/tag", RefTarget::normal(commit4.id().clone()));
|
||
assert_matches!(
|
||
resolve_symbol(mut_repo, "tag"),
|
||
Err(RevsetResolutionError::NoSuchRevision { .. })
|
||
);
|
||
|
||
// Unqualified remote-tracking branch name
|
||
mut_repo.set_git_ref_target(
|
||
"refs/remotes/origin/remote-branch",
|
||
RefTarget::normal(commit2.id().clone()),
|
||
);
|
||
assert_matches!(
|
||
resolve_symbol(mut_repo, "origin/remote-branch"),
|
||
Err(RevsetResolutionError::NoSuchRevision { .. })
|
||
);
|
||
|
||
// Conflicted ref resolves to its "adds"
|
||
assert_eq!(
|
||
resolve_symbol(mut_repo, "refs/heads/conflicted").unwrap(),
|
||
vec![commit1.id().clone(), commit3.id().clone()]
|
||
);
|
||
}
|
||
|
||
fn resolve_commit_ids(repo: &dyn Repo, revset_str: &str) -> Vec<CommitId> {
|
||
let settings = testutils::user_settings();
|
||
let aliases_map = RevsetAliasesMap::default();
|
||
let revset_extensions = RevsetExtensions::default();
|
||
let context = RevsetParseContext::new(
|
||
&aliases_map,
|
||
settings.user_email(),
|
||
&revset_extensions,
|
||
None,
|
||
);
|
||
let expression = optimize(parse(revset_str, &context).unwrap());
|
||
let symbol_resolver = DefaultSymbolResolver::new(repo, revset_extensions.symbol_resolvers());
|
||
let expression = expression
|
||
.resolve_user_expression(repo, &symbol_resolver)
|
||
.unwrap();
|
||
expression.evaluate(repo).unwrap().iter().collect()
|
||
}
|
||
|
||
fn resolve_commit_ids_in_workspace(
|
||
repo: &dyn Repo,
|
||
revset_str: &str,
|
||
workspace: &Workspace,
|
||
cwd: Option<&Path>,
|
||
) -> Vec<CommitId> {
|
||
let settings = testutils::user_settings();
|
||
let path_converter = RepoPathUiConverter::Fs {
|
||
cwd: cwd.unwrap_or_else(|| workspace.workspace_root()).to_owned(),
|
||
base: workspace.workspace_root().to_owned(),
|
||
};
|
||
let workspace_ctx = RevsetWorkspaceContext {
|
||
path_converter: &path_converter,
|
||
workspace_id: workspace.workspace_id(),
|
||
};
|
||
let aliases_map = RevsetAliasesMap::default();
|
||
let extensions = RevsetExtensions::default();
|
||
let context = RevsetParseContext::new(
|
||
&aliases_map,
|
||
settings.user_email(),
|
||
&extensions,
|
||
Some(workspace_ctx),
|
||
);
|
||
let expression = optimize(parse(revset_str, &context).unwrap());
|
||
let symbol_resolver =
|
||
DefaultSymbolResolver::new(repo, &([] as [&Box<dyn SymbolResolverExtension>; 0]));
|
||
let expression = expression
|
||
.resolve_user_expression(repo, &symbol_resolver)
|
||
.unwrap();
|
||
expression.evaluate(repo).unwrap().iter().collect()
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_root_and_checkout() {
|
||
let settings = testutils::user_settings();
|
||
let test_workspace = TestWorkspace::init(&settings);
|
||
let repo = &test_workspace.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
|
||
// Can find the root commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "root()"),
|
||
vec![root_commit.id().clone()]
|
||
);
|
||
|
||
// Can find the current working-copy commit
|
||
mut_repo
|
||
.set_wc_commit(WorkspaceId::default(), commit1.id().clone())
|
||
.unwrap();
|
||
assert_eq!(
|
||
resolve_commit_ids_in_workspace(mut_repo, "@", &test_workspace.workspace, None),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_heads() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit1]);
|
||
|
||
// Heads of an empty set is an empty set
|
||
assert_eq!(resolve_commit_ids(mut_repo, "heads(none())"), vec![]);
|
||
|
||
// Heads of the root is the root
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "heads(root())"),
|
||
vec![root_commit.id().clone()]
|
||
);
|
||
|
||
// Heads of a single commit is that commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("heads({})", commit2.id().hex())),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
|
||
// Heads of a parent and a child is the child
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("heads({} | {})", commit2.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
|
||
// Heads of a grandparent and a grandchild is the grandchild (unlike Mercurial's
|
||
// heads() revset, which would include both)
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("heads({} | {})", commit1.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
|
||
// Heads should be sorted in reverse index position order
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("heads({} | {})", commit3.id().hex(), commit4.id().hex())
|
||
),
|
||
vec![commit4.id().clone(), commit3.id().clone()]
|
||
);
|
||
|
||
// Heads of all commits is the set of visible heads in the repo
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "heads(all())"),
|
||
resolve_commit_ids(mut_repo, "visible_heads()")
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_roots() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
|
||
// Roots of an empty set is an empty set
|
||
assert_eq!(resolve_commit_ids(mut_repo, "roots(none())"), vec![]);
|
||
|
||
// Roots of the root is the root
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "roots(root())"),
|
||
vec![root_commit.id().clone()]
|
||
);
|
||
|
||
// Roots of a single commit is that commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("roots({})", commit2.id().hex())),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
|
||
// Roots of a parent and a child is the parent
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("roots({} | {})", commit2.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
|
||
// Roots of a grandparent and a grandchild is the grandparent (unlike
|
||
// Mercurial's roots() revset, which would include both)
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("roots({} | {})", commit1.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
|
||
// Roots of all commits is the root commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "roots(all())"),
|
||
vec![root_commit.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_parents() {
|
||
let settings = testutils::user_settings();
|
||
let test_workspace = TestWorkspace::init(&settings);
|
||
let repo = &test_workspace.repo;
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.initial_commit();
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit2, &commit3]);
|
||
let commit5 = graph_builder.commit_with_parents(&[&commit2]);
|
||
|
||
// The root commit has no parents
|
||
assert_eq!(resolve_commit_ids(mut_repo, "root()-"), vec![]);
|
||
|
||
// Can find parents of the current working-copy commit
|
||
mut_repo
|
||
.set_wc_commit(WorkspaceId::default(), commit2.id().clone())
|
||
.unwrap();
|
||
assert_eq!(
|
||
resolve_commit_ids_in_workspace(mut_repo, "@-", &test_workspace.workspace, None,),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
|
||
// Can find parents of a merge commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("{}-", commit4.id().hex())),
|
||
vec![commit3.id().clone(), commit2.id().clone()]
|
||
);
|
||
|
||
// Parents of all commits in input are returned
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})-", commit2.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit1.id().clone(), root_commit.id().clone()]
|
||
);
|
||
|
||
// Parents already in input set are returned
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})-", commit1.id().hex(), commit2.id().hex())
|
||
),
|
||
vec![commit1.id().clone(), root_commit.id().clone()]
|
||
);
|
||
|
||
// Parents shared among commits in input are not repeated
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})-", commit4.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![commit3.id().clone(), commit2.id().clone()]
|
||
);
|
||
|
||
// Can find parents of parents, which may be optimized to single query
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("{}--", commit4.id().hex())),
|
||
vec![commit1.id().clone(), root_commit.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})--", commit4.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![commit1.id().clone(), root_commit.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})--", commit4.id().hex(), commit2.id().hex())
|
||
),
|
||
vec![commit1.id().clone(), root_commit.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_children() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit2.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit4 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit5 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit3.id().clone(), commit4.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit6 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit5.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
|
||
// Can find children of the root commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "root()+"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
|
||
// Children of all commits in input are returned, including those already in the
|
||
// input set
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})+", commit1.id().hex(), commit2.id().hex())
|
||
),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone()
|
||
]
|
||
);
|
||
|
||
// Children shared among commits in input are not repeated
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})+", commit3.id().hex(), commit4.id().hex())
|
||
),
|
||
vec![commit5.id().clone()]
|
||
);
|
||
|
||
// Can find children of children, which may be optimized to single query
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "root()++"),
|
||
vec![commit4.id().clone(), commit2.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("(root() | {})++", commit1.id().hex())),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("({} | {})++", commit4.id().hex(), commit2.id().hex())
|
||
),
|
||
vec![commit6.id().clone(), commit5.id().clone()]
|
||
);
|
||
|
||
// Empty root
|
||
assert_eq!(resolve_commit_ids(mut_repo, "none()+"), vec![]);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_ancestors() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit1, &commit3]);
|
||
|
||
// The ancestors of the root commit is just the root commit itself
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "::root()"),
|
||
vec![root_commit.id().clone()]
|
||
);
|
||
|
||
// Can find ancestors of a specific commit. Commits reachable via multiple paths
|
||
// are not repeated.
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("::{}", commit4.id().hex())),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Can find ancestors of parents or parents of ancestors, which may be optimized
|
||
// to single query
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("::({}-)", commit4.id().hex()),),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone(),
|
||
]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("(::({}|{}))-", commit3.id().hex(), commit2.id().hex()),
|
||
),
|
||
vec![
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone(),
|
||
]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("::(({}|{})-)", commit3.id().hex(), commit2.id().hex()),
|
||
),
|
||
vec![
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Can find last n ancestors of a commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("ancestors({}, 0)", commit2.id().hex())),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("ancestors({}, 1)", commit3.id().hex())),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("ancestors({}, 3)", commit3.id().hex())),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_range() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit1, &commit3]);
|
||
|
||
// The range from the root to the root is empty (because the left side of the
|
||
// range is exclusive)
|
||
assert_eq!(resolve_commit_ids(mut_repo, "root()..root()"), vec![]);
|
||
|
||
// Linear range
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}..{}", commit1.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit3.id().clone(), commit2.id().clone()]
|
||
);
|
||
|
||
// Empty range (descendant first)
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}..{}", commit3.id().hex(), commit1.id().hex())
|
||
),
|
||
vec![]
|
||
);
|
||
|
||
// Range including a merge
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}..{}", commit1.id().hex(), commit4.id().hex())
|
||
),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone()
|
||
]
|
||
);
|
||
|
||
// Range including merge ancestors: commit4-- == root | commit2
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}--..{}", commit4.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
|
||
// Sibling commits
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}..{}", commit2.id().hex(), commit3.id().hex())
|
||
),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
|
||
// Left operand defaults to root()
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("..{}", commit2.id().hex())),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
|
||
// Right operand defaults to visible_heads()
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("{}..", commit2.id().hex())),
|
||
vec![commit4.id().clone(), commit3.id().clone()]
|
||
);
|
||
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, ".."),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_dag_range() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit_id = repo.store().root_commit_id().clone();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit5 = graph_builder.commit_with_parents(&[&commit3, &commit4]);
|
||
|
||
// Can get DAG range of just the root commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "root()::root()"),
|
||
vec![root_commit_id.clone()]
|
||
);
|
||
|
||
// Linear range
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}::{}", root_commit_id.hex(), commit2.id().hex())
|
||
),
|
||
vec![
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit_id.clone(),
|
||
]
|
||
);
|
||
|
||
// Empty range
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}::{}", commit2.id().hex(), commit4.id().hex())
|
||
),
|
||
vec![]
|
||
);
|
||
|
||
// Empty root
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("none()::{}", commit5.id().hex())),
|
||
vec![],
|
||
);
|
||
|
||
// Multiple root, commit1 shouldn't be hidden by commit2
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"({}|{})::{}",
|
||
commit1.id().hex(),
|
||
commit2.id().hex(),
|
||
commit3.id().hex()
|
||
)
|
||
),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone()
|
||
]
|
||
);
|
||
|
||
// Including a merge
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}::{}", commit1.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Including a merge, but ancestors only from one side
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{}::{}", commit2.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Full range meaning all()
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "::"),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit_id.clone(),
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_connected() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit_id = repo.store().root_commit_id().clone();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit5 = graph_builder.commit_with_parents(&[&commit3, &commit4]);
|
||
|
||
// Connecting an empty set yields an empty set
|
||
assert_eq!(resolve_commit_ids(mut_repo, "connected(none())"), vec![]);
|
||
|
||
// Can connect just the root commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "connected(root())"),
|
||
vec![root_commit_id.clone()]
|
||
);
|
||
|
||
// Can connect linearly
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"connected({} | {})",
|
||
root_commit_id.hex(),
|
||
commit2.id().hex()
|
||
)
|
||
),
|
||
vec![commit2.id().clone(), commit1.id().clone(), root_commit_id]
|
||
);
|
||
|
||
// Siblings don't get connected
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("connected({} | {})", commit2.id().hex(), commit4.id().hex())
|
||
),
|
||
vec![commit4.id().clone(), commit2.id().clone()]
|
||
);
|
||
|
||
// Including a merge
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("connected({} | {})", commit1.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Including a merge, but ancestors only from one side
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("connected({} | {})", commit2.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_reachable() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
// Construct 3 separate subgraphs off the root commit.
|
||
// 1 is a chain, 2 is a merge, 3 is a pyramidal monstrosity
|
||
let graph1commit1 = write_random_commit(mut_repo, &settings);
|
||
let graph1commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![graph1commit1.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let graph1commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![graph1commit2.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let graph2commit1 = write_random_commit(mut_repo, &settings);
|
||
let graph2commit2 = write_random_commit(mut_repo, &settings);
|
||
let graph2commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![graph2commit1.id().clone(), graph2commit2.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let graph3commit1 = write_random_commit(mut_repo, &settings);
|
||
let graph3commit2 = write_random_commit(mut_repo, &settings);
|
||
let graph3commit3 = write_random_commit(mut_repo, &settings);
|
||
let graph3commit4 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![graph3commit1.id().clone(), graph3commit2.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let graph3commit5 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![graph3commit2.id().clone(), graph3commit3.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let graph3commit6 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![graph3commit3.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let graph3commit7 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![graph3commit4.id().clone(), graph3commit5.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
|
||
// Domain is respected.
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"reachable({}, all() ~ ::{})",
|
||
graph1commit2.id().hex(),
|
||
graph1commit1.id().hex()
|
||
)
|
||
),
|
||
vec![graph1commit3.id().clone(), graph1commit2.id().clone(),]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"reachable({}, all() ~ ::{})",
|
||
graph1commit2.id().hex(),
|
||
graph1commit3.id().hex()
|
||
)
|
||
),
|
||
vec![]
|
||
);
|
||
|
||
// Each graph is identifiable from any node in it.
|
||
for (i, commit) in [&graph1commit1, &graph1commit2, &graph1commit3]
|
||
.iter()
|
||
.enumerate()
|
||
{
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("reachable({}, all() ~ root())", commit.id().hex())
|
||
),
|
||
vec![
|
||
graph1commit3.id().clone(),
|
||
graph1commit2.id().clone(),
|
||
graph1commit1.id().clone(),
|
||
],
|
||
"commit {}",
|
||
i + 1
|
||
);
|
||
}
|
||
|
||
for (i, commit) in [&graph2commit1, &graph2commit2, &graph2commit3]
|
||
.iter()
|
||
.enumerate()
|
||
{
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("reachable({}, all() ~ root())", commit.id().hex())
|
||
),
|
||
vec![
|
||
graph2commit3.id().clone(),
|
||
graph2commit2.id().clone(),
|
||
graph2commit1.id().clone(),
|
||
],
|
||
"commit {}",
|
||
i + 1
|
||
);
|
||
}
|
||
|
||
for (i, commit) in [
|
||
&graph3commit1,
|
||
&graph3commit2,
|
||
&graph3commit3,
|
||
&graph3commit4,
|
||
&graph3commit5,
|
||
&graph3commit6,
|
||
&graph3commit7,
|
||
]
|
||
.iter()
|
||
.enumerate()
|
||
{
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("reachable({}, all() ~ root())", commit.id().hex())
|
||
),
|
||
vec![
|
||
graph3commit7.id().clone(),
|
||
graph3commit6.id().clone(),
|
||
graph3commit5.id().clone(),
|
||
graph3commit4.id().clone(),
|
||
graph3commit3.id().clone(),
|
||
graph3commit2.id().clone(),
|
||
graph3commit1.id().clone(),
|
||
],
|
||
"commit {}",
|
||
i + 1
|
||
);
|
||
}
|
||
|
||
// Test a split of the pyramidal monstrosity.
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"reachable({}, all() ~ ::{})",
|
||
graph3commit4.id().hex(),
|
||
graph3commit5.id().hex()
|
||
)
|
||
),
|
||
vec![
|
||
graph3commit7.id().clone(),
|
||
graph3commit4.id().clone(),
|
||
graph3commit1.id().clone(),
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_descendants() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let root_commit_id = repo.store().root_commit_id().clone();
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit2.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit4 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit5 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit3.id().clone(), commit4.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
let commit6 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit5.id().clone()])
|
||
.write()
|
||
.unwrap();
|
||
|
||
// The descendants of the root commit are all the commits in the repo
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "root()::"),
|
||
vec![
|
||
commit6.id().clone(),
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit_id,
|
||
]
|
||
);
|
||
|
||
// Can find descendants of a specific commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("{}::", commit2.id().hex())),
|
||
vec![
|
||
commit6.id().clone(),
|
||
commit5.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Can find descendants of children or children of descendants, which may be
|
||
// optimized to single query
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("({}+)::", commit1.id().hex())),
|
||
vec![
|
||
commit6.id().clone(),
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("({}++)::", commit1.id().hex())),
|
||
vec![
|
||
commit6.id().clone(),
|
||
commit5.id().clone(),
|
||
commit3.id().clone(),
|
||
]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("(({}|{})::)+", commit4.id().hex(), commit2.id().hex()),
|
||
),
|
||
vec![
|
||
commit6.id().clone(),
|
||
commit5.id().clone(),
|
||
commit3.id().clone(),
|
||
]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("(({}|{})+)::", commit4.id().hex(), commit2.id().hex()),
|
||
),
|
||
vec![
|
||
commit6.id().clone(),
|
||
commit5.id().clone(),
|
||
commit3.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Can find next n descendants of a commit
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("descendants({}, 0)", commit2.id().hex())),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("descendants({}, 1)", commit3.id().hex())),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("descendants({}, 3)", commit3.id().hex())),
|
||
vec![
|
||
commit6.id().clone(),
|
||
commit5.id().clone(),
|
||
commit3.id().clone(),
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_none() {
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
// none() is empty (doesn't include the checkout, for example)
|
||
assert_eq!(resolve_commit_ids(repo.as_ref(), "none()"), vec![]);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_all() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let root_commit_id = repo.store().root_commit_id().clone();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit2, &commit3]);
|
||
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "all()"),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit_id,
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_visible_heads() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit1]);
|
||
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "visible_heads()"),
|
||
vec![commit3.id().clone(), commit2.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_git_refs() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
let commit3 = write_random_commit(mut_repo, &settings);
|
||
let commit4 = write_random_commit(mut_repo, &settings);
|
||
|
||
// Can get git refs when there are none
|
||
assert_eq!(resolve_commit_ids(mut_repo, "git_refs()"), vec![]);
|
||
// Can get a mix of git refs
|
||
mut_repo.set_git_ref_target(
|
||
"refs/heads/branch1",
|
||
RefTarget::normal(commit1.id().clone()),
|
||
);
|
||
mut_repo.set_git_ref_target("refs/tags/tag1", RefTarget::normal(commit2.id().clone()));
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "git_refs()"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// Two refs pointing to the same commit does not result in a duplicate in the
|
||
// revset
|
||
mut_repo.set_git_ref_target("refs/tags/tag2", RefTarget::normal(commit2.id().clone()));
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "git_refs()"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// Can get git refs when there are conflicted refs
|
||
mut_repo.set_git_ref_target(
|
||
"refs/heads/branch1",
|
||
RefTarget::from_legacy_form(
|
||
[commit1.id().clone()],
|
||
[commit2.id().clone(), commit3.id().clone()],
|
||
),
|
||
);
|
||
mut_repo.set_git_ref_target(
|
||
"refs/tags/tag1",
|
||
RefTarget::from_legacy_form(
|
||
[commit2.id().clone()],
|
||
[commit3.id().clone(), commit4.id().clone()],
|
||
),
|
||
);
|
||
mut_repo.set_git_ref_target("refs/tags/tag2", RefTarget::absent());
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "git_refs()"),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone()
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_git_head() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
|
||
// Can get git head when it's not set
|
||
assert_eq!(resolve_commit_ids(mut_repo, "git_head()"), vec![]);
|
||
mut_repo.set_git_head_target(RefTarget::normal(commit1.id().clone()));
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "git_head()"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_branches() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
let commit3 = write_random_commit(mut_repo, &settings);
|
||
let commit4 = write_random_commit(mut_repo, &settings);
|
||
|
||
// Can get branches when there are none
|
||
assert_eq!(resolve_commit_ids(mut_repo, "branches()"), vec![]);
|
||
// Can get a few branches
|
||
mut_repo.set_local_branch_target("branch1", RefTarget::normal(commit1.id().clone()));
|
||
mut_repo.set_local_branch_target("branch2", RefTarget::normal(commit2.id().clone()));
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "branches()"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// Can get branches with matching names
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "branches(branch1)"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "branches(branch)"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "branches(exact:branch1)"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"branches(glob:"Branch?")"#),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"branches(glob-i:"Branch?")"#),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// Can silently resolve to an empty set if there's no matches
|
||
assert_eq!(resolve_commit_ids(mut_repo, "branches(branch3)"), vec![]);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "branches(exact:ranch1)"),
|
||
vec![]
|
||
);
|
||
// Two branches pointing to the same commit does not result in a duplicate in
|
||
// the revset
|
||
mut_repo.set_local_branch_target("branch3", RefTarget::normal(commit2.id().clone()));
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "branches()"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// Can get branches when there are conflicted refs
|
||
mut_repo.set_local_branch_target(
|
||
"branch1",
|
||
RefTarget::from_legacy_form(
|
||
[commit1.id().clone()],
|
||
[commit2.id().clone(), commit3.id().clone()],
|
||
),
|
||
);
|
||
mut_repo.set_local_branch_target(
|
||
"branch2",
|
||
RefTarget::from_legacy_form(
|
||
[commit2.id().clone()],
|
||
[commit3.id().clone(), commit4.id().clone()],
|
||
),
|
||
);
|
||
mut_repo.set_local_branch_target("branch3", RefTarget::absent());
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "branches()"),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone()
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_remote_branches() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
let tracking_remote_ref = |target| RemoteRef {
|
||
target,
|
||
state: RemoteRefState::Tracking,
|
||
};
|
||
let normal_tracking_remote_ref =
|
||
|id: &CommitId| tracking_remote_ref(RefTarget::normal(id.clone()));
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = write_random_commit(mut_repo, &settings);
|
||
let commit2 = write_random_commit(mut_repo, &settings);
|
||
let commit3 = write_random_commit(mut_repo, &settings);
|
||
let commit4 = write_random_commit(mut_repo, &settings);
|
||
let commit_git_remote = write_random_commit(mut_repo, &settings);
|
||
|
||
// Can get branches when there are none
|
||
assert_eq!(resolve_commit_ids(mut_repo, "remote_branches()"), vec![]);
|
||
// Branch 1 is untracked on remote origin
|
||
mut_repo.set_remote_branch(
|
||
"branch1",
|
||
"origin",
|
||
RemoteRef {
|
||
target: RefTarget::normal(commit1.id().clone()),
|
||
state: RemoteRefState::New,
|
||
},
|
||
);
|
||
// Branch 2 is tracked on remote private
|
||
mut_repo.set_remote_branch(
|
||
"branch2",
|
||
"private",
|
||
normal_tracking_remote_ref(commit2.id()),
|
||
);
|
||
// Git-tracking branches aren't included
|
||
mut_repo.set_remote_branch(
|
||
"branch",
|
||
git::REMOTE_NAME_FOR_LOCAL_GIT_REPO,
|
||
normal_tracking_remote_ref(commit_git_remote.id()),
|
||
);
|
||
// Can get a few branches
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches()"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// Can get branches with matching names
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches(branch1)"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches(branch)"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches(exact:branch1)"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
// Can get branches from matching remotes
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches("", origin)"#),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches("", ri)"#),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches("", exact:origin)"#),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
// Can get branches with matching names from matching remotes
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches(branch1, ri)"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches(branch, private)"#),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches(exact:branch1, exact:origin)"#),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
// Can filter branches by tracked and untracked
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "tracked_remote_branches()"),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "untracked_remote_branches()"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "untracked_remote_branches(branch1, origin)"),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "tracked_remote_branches(branch2, private)"),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
// Can silently resolve to an empty set if there's no matches
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches(branch3)"),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches("", upstream)"#),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches(branch1, private)"#),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches(exact:ranch1, exact:origin)"#),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, r#"remote_branches(exact:branch1, exact:orig)"#),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "tracked_remote_branches(branch1)"),
|
||
vec![]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "untracked_remote_branches(branch2)"),
|
||
vec![]
|
||
);
|
||
// Two branches pointing to the same commit does not result in a duplicate in
|
||
// the revset
|
||
mut_repo.set_remote_branch(
|
||
"branch3",
|
||
"origin",
|
||
normal_tracking_remote_ref(commit2.id()),
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches()"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// The commits don't have to be in the current set of heads to be included.
|
||
mut_repo.remove_head(commit2.id());
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches()"),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
// Can get branches when there are conflicted refs
|
||
mut_repo.set_remote_branch(
|
||
"branch1",
|
||
"origin",
|
||
tracking_remote_ref(RefTarget::from_legacy_form(
|
||
[commit1.id().clone()],
|
||
[commit2.id().clone(), commit3.id().clone()],
|
||
)),
|
||
);
|
||
mut_repo.set_remote_branch(
|
||
"branch2",
|
||
"private",
|
||
tracking_remote_ref(RefTarget::from_legacy_form(
|
||
[commit2.id().clone()],
|
||
[commit3.id().clone(), commit4.id().clone()],
|
||
)),
|
||
);
|
||
mut_repo.set_remote_branch("branch3", "origin", RemoteRef::absent());
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "remote_branches()"),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone()
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_latest() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let mut write_commit_with_committer_timestamp = |sec: i64| {
|
||
let builder = create_random_commit(mut_repo, &settings);
|
||
let mut committer = builder.committer().clone();
|
||
committer.timestamp.timestamp = MillisSinceEpoch(sec * 1000);
|
||
builder.set_committer(committer).write().unwrap()
|
||
};
|
||
let commit1_t3 = write_commit_with_committer_timestamp(3);
|
||
let commit2_t2 = write_commit_with_committer_timestamp(2);
|
||
let commit3_t2 = write_commit_with_committer_timestamp(2);
|
||
let commit4_t1 = write_commit_with_committer_timestamp(1);
|
||
|
||
// Pick the latest entry by default (count = 1)
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "latest(all())"),
|
||
vec![commit1_t3.id().clone()],
|
||
);
|
||
|
||
// Should not panic with count = 0 or empty set
|
||
assert_eq!(resolve_commit_ids(mut_repo, "latest(all(), 0)"), vec![]);
|
||
assert_eq!(resolve_commit_ids(mut_repo, "latest(none())"), vec![]);
|
||
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "latest(all(), 1)"),
|
||
vec![commit1_t3.id().clone()],
|
||
);
|
||
|
||
// Tie-breaking: pick the later entry in position
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "latest(all(), 2)"),
|
||
vec![commit3_t2.id().clone(), commit1_t3.id().clone()],
|
||
);
|
||
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "latest(all(), 3)"),
|
||
vec![
|
||
commit3_t2.id().clone(),
|
||
commit2_t2.id().clone(),
|
||
commit1_t3.id().clone(),
|
||
],
|
||
);
|
||
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "latest(all(), 4)"),
|
||
vec![
|
||
commit4_t1.id().clone(),
|
||
commit3_t2.id().clone(),
|
||
commit2_t2.id().clone(),
|
||
commit1_t3.id().clone(),
|
||
],
|
||
);
|
||
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "latest(all(), 5)"),
|
||
vec![
|
||
commit4_t1.id().clone(),
|
||
commit3_t2.id().clone(),
|
||
commit2_t2.id().clone(),
|
||
commit1_t3.id().clone(),
|
||
mut_repo.store().root_commit_id().clone(),
|
||
],
|
||
);
|
||
|
||
// Should not panic if count is larger than the candidates size
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "latest(~root(), 5)"),
|
||
vec![
|
||
commit4_t1.id().clone(),
|
||
commit3_t2.id().clone(),
|
||
commit2_t2.id().clone(),
|
||
commit1_t3.id().clone(),
|
||
],
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_merges() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.initial_commit();
|
||
let commit3 = graph_builder.initial_commit();
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit1, &commit2]);
|
||
let commit5 = graph_builder.commit_with_parents(&[&commit1, &commit2, &commit3]);
|
||
|
||
// Finds all merges by default
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "merges()"),
|
||
vec![commit5.id().clone(), commit4.id().clone(),]
|
||
);
|
||
// Searches only among candidates if specified
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("::{} & merges()", commit5.id().hex())),
|
||
vec![commit5.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_description() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let commit1 = create_random_commit(mut_repo, &settings)
|
||
.set_description("commit 1")
|
||
.write()
|
||
.unwrap();
|
||
let commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.set_description("commit 2")
|
||
.write()
|
||
.unwrap();
|
||
let commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit2.id().clone()])
|
||
.set_description("commit 3")
|
||
.write()
|
||
.unwrap();
|
||
|
||
// Can find multiple matches
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "description(commit)"),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone()
|
||
]
|
||
);
|
||
// Can find a unique match
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "description(\"commit 2\")"),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
// Searches only among candidates if specified
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "visible_heads() & description(\"commit 2\")"),
|
||
vec![]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_author() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let timestamp = Timestamp {
|
||
timestamp: MillisSinceEpoch(0),
|
||
tz_offset: 0,
|
||
};
|
||
let commit1 = create_random_commit(mut_repo, &settings)
|
||
.set_author(Signature {
|
||
name: "name1".to_string(),
|
||
email: "email1".to_string(),
|
||
timestamp: timestamp.clone(),
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
let commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.set_author(Signature {
|
||
name: "name2".to_string(),
|
||
email: "email2".to_string(),
|
||
timestamp: timestamp.clone(),
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
let commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit2.id().clone()])
|
||
.set_author(Signature {
|
||
name: "name3".to_string(),
|
||
email: "email3".to_string(),
|
||
timestamp,
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
|
||
// Can find multiple matches
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "author(name)"),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone()
|
||
]
|
||
);
|
||
// Can find a unique match by either name or email
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "author(\"name2\")"),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "author(\"email3\")"),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
// Can match case‐insensitively
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "author(substring-i:Name)"),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
]
|
||
);
|
||
// Searches only among candidates if specified
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "visible_heads() & author(\"name2\")"),
|
||
vec![]
|
||
);
|
||
// Filter by union of pure predicate and set
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("root().. & (author(name1) | {})", commit3.id().hex())
|
||
),
|
||
vec![commit3.id().clone(), commit1.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_mine() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let timestamp = Timestamp {
|
||
timestamp: MillisSinceEpoch(0),
|
||
tz_offset: 0,
|
||
};
|
||
let commit1 = create_random_commit(mut_repo, &settings)
|
||
.set_author(Signature {
|
||
name: "name1".to_string(),
|
||
email: "email1".to_string(),
|
||
timestamp: timestamp.clone(),
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
let commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.set_author(Signature {
|
||
name: "name2".to_string(),
|
||
email: settings.user_email(),
|
||
timestamp: timestamp.clone(),
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
// Can find a unique match
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "mine()"),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
let commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit2.id().clone()])
|
||
.set_author(Signature {
|
||
name: "name3".to_string(),
|
||
// Test that matches are case‐insensitive
|
||
email: settings.user_email().to_ascii_uppercase(),
|
||
timestamp,
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
// Can find multiple matches
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "mine()"),
|
||
vec![commit3.id().clone(), commit2.id().clone()]
|
||
);
|
||
// Searches only among candidates if specified
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "visible_heads() & mine()"),
|
||
vec![commit3.id().clone()],
|
||
);
|
||
// Filter by union of pure predicate and set
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("root().. & (mine() | {})", commit1.id().hex())
|
||
),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone()
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_committer() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let timestamp = Timestamp {
|
||
timestamp: MillisSinceEpoch(0),
|
||
tz_offset: 0,
|
||
};
|
||
let commit1 = create_random_commit(mut_repo, &settings)
|
||
.set_committer(Signature {
|
||
name: "name1".to_string(),
|
||
email: "email1".to_string(),
|
||
timestamp: timestamp.clone(),
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
let commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.set_committer(Signature {
|
||
name: "name2".to_string(),
|
||
email: "email2".to_string(),
|
||
timestamp: timestamp.clone(),
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
let commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit2.id().clone()])
|
||
.set_committer(Signature {
|
||
name: "name3".to_string(),
|
||
email: "email3".to_string(),
|
||
timestamp,
|
||
})
|
||
.write()
|
||
.unwrap();
|
||
|
||
// Can find multiple matches
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "committer(name)"),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone()
|
||
]
|
||
);
|
||
// Can find a unique match by either name or email
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "committer(\"name2\")"),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "committer(\"email3\")"),
|
||
vec![commit3.id().clone()]
|
||
);
|
||
// Can match case‐insensitively
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "committer(substring-i:Name)"),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
]
|
||
);
|
||
// Searches only among candidates if specified
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "visible_heads() & committer(\"name2\")"),
|
||
vec![]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_union() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit3]);
|
||
let commit5 = graph_builder.commit_with_parents(&[&commit2]);
|
||
|
||
// Union between ancestors
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("::{} | ::{}", commit4.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone()
|
||
]
|
||
);
|
||
|
||
// Unioning can add back commits removed by difference
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"(::{} ~ ::{}) | ::{}",
|
||
commit4.id().hex(),
|
||
commit2.id().hex(),
|
||
commit5.id().hex()
|
||
)
|
||
),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Unioning of disjoint sets
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"(::{} ~ ::{}) | {}",
|
||
commit4.id().hex(),
|
||
commit2.id().hex(),
|
||
commit5.id().hex(),
|
||
)
|
||
),
|
||
vec![
|
||
commit5.id().clone(),
|
||
commit4.id().clone(),
|
||
commit3.id().clone()
|
||
]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_machine_generated_union() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
|
||
// This query shouldn't trigger stack overflow. Here we use "x::y" in case
|
||
// we had optimization path for trivial "commit_id|.." expression.
|
||
let revset_str = iter::repeat(format!("({}::{})", commit1.id().hex(), commit2.id().hex()))
|
||
.take(5000)
|
||
.join("|");
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &revset_str),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_intersection() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit3]);
|
||
let commit5 = graph_builder.commit_with_parents(&[&commit2]);
|
||
|
||
// Intersection between ancestors
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("::{} & ::{}", commit4.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![
|
||
commit2.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone()
|
||
]
|
||
);
|
||
|
||
// Intersection of disjoint sets
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("{} & {}", commit4.id().hex(), commit2.id().hex())
|
||
),
|
||
vec![]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_difference() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let root_commit = repo.store().root_commit();
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo);
|
||
let commit1 = graph_builder.initial_commit();
|
||
let commit2 = graph_builder.commit_with_parents(&[&commit1]);
|
||
let commit3 = graph_builder.commit_with_parents(&[&commit2]);
|
||
let commit4 = graph_builder.commit_with_parents(&[&commit3]);
|
||
let commit5 = graph_builder.commit_with_parents(&[&commit2]);
|
||
|
||
// Difference from all
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("~::{}", commit5.id().hex())),
|
||
vec![commit4.id().clone(), commit3.id().clone()]
|
||
);
|
||
|
||
// Difference between ancestors
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("::{} ~ ::{}", commit4.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![commit4.id().clone(), commit3.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("::{} ~ ::{}", commit5.id().hex(), commit4.id().hex())
|
||
),
|
||
vec![commit5.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("~::{} & ::{}", commit4.id().hex(), commit5.id().hex())
|
||
),
|
||
vec![commit5.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!("::{} ~ ::{}", commit4.id().hex(), commit2.id().hex())
|
||
),
|
||
vec![commit4.id().clone(), commit3.id().clone()]
|
||
);
|
||
|
||
// Associativity
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"::{} ~ {} ~ {}",
|
||
commit4.id().hex(),
|
||
commit2.id().hex(),
|
||
commit3.id().hex()
|
||
)
|
||
),
|
||
vec![
|
||
commit4.id().clone(),
|
||
commit1.id().clone(),
|
||
root_commit.id().clone(),
|
||
]
|
||
);
|
||
|
||
// Subtracting a difference does not add back any commits
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"(::{} ~ ::{}) ~ (::{} ~ ::{})",
|
||
commit4.id().hex(),
|
||
commit1.id().hex(),
|
||
commit3.id().hex(),
|
||
commit1.id().hex(),
|
||
)
|
||
),
|
||
vec![commit4.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_filter_combinator() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let root_commit_id = repo.store().root_commit_id();
|
||
let commit1 = create_random_commit(mut_repo, &settings)
|
||
.set_description("commit 1")
|
||
.write()
|
||
.unwrap();
|
||
let commit2 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit1.id().clone()])
|
||
.set_description("commit 2")
|
||
.write()
|
||
.unwrap();
|
||
let commit3 = create_random_commit(mut_repo, &settings)
|
||
.set_parents(vec![commit2.id().clone()])
|
||
.set_description("commit 3")
|
||
.write()
|
||
.unwrap();
|
||
|
||
// Not intersected with a set node
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "~description(1)"),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
root_commit_id.clone(),
|
||
],
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "description(1) | description(2)"),
|
||
vec![commit2.id().clone(), commit1.id().clone()],
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
"description(commit) ~ (description(2) | description(3))",
|
||
),
|
||
vec![commit1.id().clone()],
|
||
);
|
||
|
||
// Intersected with a set node
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "root().. & ~description(1)"),
|
||
vec![commit3.id().clone(), commit2.id().clone()],
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids(
|
||
mut_repo,
|
||
&format!(
|
||
"{}.. & (description(1) | description(2))",
|
||
commit1.id().hex(),
|
||
)
|
||
),
|
||
vec![commit2.id().clone()],
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_file() {
|
||
let settings = testutils::user_settings();
|
||
let test_workspace = TestWorkspace::init(&settings);
|
||
let repo = &test_workspace.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
let added_clean_clean = RepoPath::from_internal_string("added_clean_clean");
|
||
let added_modified_clean = RepoPath::from_internal_string("added_modified_clean");
|
||
let added_modified_removed = RepoPath::from_internal_string("added_modified_removed");
|
||
let tree1 = create_tree(
|
||
repo,
|
||
&[
|
||
(added_clean_clean, "1"),
|
||
(added_modified_clean, "1"),
|
||
(added_modified_removed, "1"),
|
||
],
|
||
);
|
||
let tree2 = create_tree(
|
||
repo,
|
||
&[
|
||
(added_clean_clean, "1"),
|
||
(added_modified_clean, "2"),
|
||
(added_modified_removed, "2"),
|
||
],
|
||
);
|
||
let tree3 = create_tree(
|
||
repo,
|
||
&[
|
||
(added_clean_clean, "1"),
|
||
(added_modified_clean, "2"),
|
||
// added_modified_removed,
|
||
],
|
||
);
|
||
let commit1 = mut_repo
|
||
.new_commit(
|
||
&settings,
|
||
vec![repo.store().root_commit_id().clone()],
|
||
tree1.id(),
|
||
)
|
||
.write()
|
||
.unwrap();
|
||
let commit2 = mut_repo
|
||
.new_commit(&settings, vec![commit1.id().clone()], tree2.id())
|
||
.write()
|
||
.unwrap();
|
||
let commit3 = mut_repo
|
||
.new_commit(&settings, vec![commit2.id().clone()], tree3.id())
|
||
.write()
|
||
.unwrap();
|
||
let commit4 = mut_repo
|
||
.new_commit(&settings, vec![commit3.id().clone()], tree3.id())
|
||
.write()
|
||
.unwrap();
|
||
|
||
let resolve = |file_path: &RepoPath| -> Vec<CommitId> {
|
||
let mut_repo = &*mut_repo;
|
||
let expression = RevsetExpression::filter(RevsetFilterPredicate::File(
|
||
FilesetExpression::prefix_path(file_path.to_owned()),
|
||
));
|
||
let revset = expression.evaluate_programmatic(mut_repo).unwrap();
|
||
revset.iter().collect()
|
||
};
|
||
|
||
assert_eq!(resolve(added_clean_clean), vec![commit1.id().clone()]);
|
||
assert_eq!(
|
||
resolve(added_modified_clean),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve(added_modified_removed),
|
||
vec![
|
||
commit3.id().clone(),
|
||
commit2.id().clone(),
|
||
commit1.id().clone()
|
||
]
|
||
);
|
||
|
||
// file() revset:
|
||
assert_eq!(
|
||
resolve_commit_ids_in_workspace(
|
||
mut_repo,
|
||
r#"file("repo/added_clean_clean")"#,
|
||
&test_workspace.workspace,
|
||
Some(test_workspace.workspace.workspace_root().parent().unwrap()),
|
||
),
|
||
vec![commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids_in_workspace(
|
||
mut_repo,
|
||
r#"file("added_clean_clean"|"added_modified_clean")"#,
|
||
&test_workspace.workspace,
|
||
Some(test_workspace.workspace.workspace_root()),
|
||
),
|
||
vec![commit2.id().clone(), commit1.id().clone()]
|
||
);
|
||
assert_eq!(
|
||
resolve_commit_ids_in_workspace(
|
||
mut_repo,
|
||
&format!(r#"{}:: & file("added_modified_clean")"#, commit2.id().hex()),
|
||
&test_workspace.workspace,
|
||
Some(test_workspace.workspace.workspace_root()),
|
||
),
|
||
vec![commit2.id().clone()]
|
||
);
|
||
|
||
// empty() revset, which is identical to ~file(".")
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, &format!("{}:: & empty()", commit1.id().hex())),
|
||
vec![commit4.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evaluate_expression_conflict() {
|
||
let settings = testutils::user_settings();
|
||
let test_workspace = TestWorkspace::init(&settings);
|
||
let repo = &test_workspace.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
|
||
// Create a few trees, including one with a conflict in `file1`
|
||
let file_path1 = RepoPath::from_internal_string("file1");
|
||
let file_path2 = RepoPath::from_internal_string("file2");
|
||
let tree1 = create_tree(repo, &[(file_path1, "1"), (file_path2, "1")]);
|
||
let tree2 = create_tree(repo, &[(file_path1, "2"), (file_path2, "2")]);
|
||
let tree3 = create_tree(repo, &[(file_path1, "3"), (file_path2, "1")]);
|
||
let tree4 = tree2.merge(&tree1, &tree3).unwrap();
|
||
|
||
let mut create_commit = |parent_ids, tree_id| {
|
||
mut_repo
|
||
.new_commit(&settings, parent_ids, tree_id)
|
||
.write()
|
||
.unwrap()
|
||
};
|
||
let commit1 = create_commit(vec![repo.store().root_commit_id().clone()], tree1.id());
|
||
let commit2 = create_commit(vec![commit1.id().clone()], tree2.id());
|
||
let commit3 = create_commit(vec![commit2.id().clone()], tree3.id());
|
||
let commit4 = create_commit(vec![commit3.id().clone()], tree4.id());
|
||
|
||
// Only commit4 has a conflict
|
||
assert_eq!(
|
||
resolve_commit_ids(mut_repo, "conflict()"),
|
||
vec![commit4.id().clone()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_reverse_graph_iterator() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
// Tests that merges, forks, direct edges, indirect edges, and "missing" edges
|
||
// are correct in reversed graph. "Missing" edges (i.e. edges to commits not
|
||
// in the input set) won't be part of the reversed graph. Conversely, there
|
||
// won't be missing edges to children not in the input.
|
||
//
|
||
// F
|
||
// |\
|
||
// D E
|
||
// |/
|
||
// C
|
||
// |
|
||
// b
|
||
// |
|
||
// A
|
||
// |
|
||
// root
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut graph_builder = CommitGraphBuilder::new(&settings, tx.mut_repo());
|
||
let commit_a = graph_builder.initial_commit();
|
||
let commit_b = graph_builder.commit_with_parents(&[&commit_a]);
|
||
let commit_c = graph_builder.commit_with_parents(&[&commit_b]);
|
||
let commit_d = graph_builder.commit_with_parents(&[&commit_c]);
|
||
let commit_e = graph_builder.commit_with_parents(&[&commit_c]);
|
||
let commit_f = graph_builder.commit_with_parents(&[&commit_d, &commit_e]);
|
||
let repo = tx.commit("test");
|
||
|
||
let revset = revset_for_commits(
|
||
repo.as_ref(),
|
||
&[&commit_a, &commit_c, &commit_d, &commit_e, &commit_f],
|
||
);
|
||
let commits = ReverseGraphIterator::new(revset.iter_graph()).collect_vec();
|
||
assert_eq!(commits.len(), 5);
|
||
assert_eq!(commits[0].0, *commit_a.id());
|
||
assert_eq!(commits[1].0, *commit_c.id());
|
||
assert_eq!(commits[2].0, *commit_d.id());
|
||
assert_eq!(commits[3].0, *commit_e.id());
|
||
assert_eq!(commits[4].0, *commit_f.id());
|
||
assert_eq!(
|
||
commits[0].1,
|
||
vec![GraphEdge::indirect(commit_c.id().clone())]
|
||
);
|
||
assert_eq!(
|
||
commits[1].1,
|
||
vec![
|
||
GraphEdge::direct(commit_e.id().clone()),
|
||
GraphEdge::direct(commit_d.id().clone()),
|
||
]
|
||
);
|
||
assert_eq!(commits[2].1, vec![GraphEdge::direct(commit_f.id().clone())]);
|
||
assert_eq!(commits[3].1, vec![GraphEdge::direct(commit_f.id().clone())]);
|
||
assert_eq!(commits[4].1, vec![]);
|
||
}
|
||
|
||
#[test]
|
||
fn test_no_such_revision_suggestion() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let commit = write_random_commit(mut_repo, &settings);
|
||
|
||
for branch_name in ["foo", "bar", "baz"] {
|
||
mut_repo.set_local_branch_target(branch_name, RefTarget::normal(commit.id().clone()));
|
||
}
|
||
|
||
assert_matches!(resolve_symbol(mut_repo, "bar"), Ok(_));
|
||
assert_matches!(
|
||
resolve_symbol(mut_repo, "bax"),
|
||
Err(RevsetResolutionError::NoSuchRevision { name, candidates })
|
||
if name == "bax" && candidates == vec!["bar".to_string(), "baz".to_string()]
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn test_revset_containing_fn() {
|
||
let settings = testutils::user_settings();
|
||
let test_repo = TestRepo::init();
|
||
let repo = &test_repo.repo;
|
||
|
||
let mut tx = repo.start_transaction(&settings);
|
||
let mut_repo = tx.mut_repo();
|
||
let commit_a = write_random_commit(mut_repo, &settings);
|
||
let commit_b = write_random_commit(mut_repo, &settings);
|
||
let commit_c = write_random_commit(mut_repo, &settings);
|
||
let commit_d = write_random_commit(mut_repo, &settings);
|
||
let repo = tx.commit("test");
|
||
|
||
let revset = revset_for_commits(repo.as_ref(), &[&commit_b, &commit_d]);
|
||
|
||
let revset_has_commit = revset.containing_fn();
|
||
assert!(!revset_has_commit(commit_a.id()));
|
||
assert!(revset_has_commit(commit_b.id()));
|
||
assert!(!revset_has_commit(commit_c.id()));
|
||
assert!(revset_has_commit(commit_d.id()));
|
||
}
|