diff --git a/lib/src/revset.rs b/lib/src/revset.rs index 076338b851..9647744505 100644 --- a/lib/src/revset.rs +++ b/lib/src/revset.rs @@ -436,7 +436,7 @@ impl RevsetExpression { self: Rc, repo: &dyn Repo, ) -> Result { - let symbol_resolver = DefaultSymbolResolver::new(repo, None); + let symbol_resolver = FailingSymbolResolver; resolve_symbols(repo, self, &symbol_resolver) .map(|expression| resolve_visibility(repo, &expression)) } @@ -1669,6 +1669,18 @@ pub trait SymbolResolver { fn resolve_symbol(&self, symbol: &str) -> Result, RevsetResolutionError>; } +/// Fails on any attempt to resolve a symbol. +pub struct FailingSymbolResolver; + +impl SymbolResolver for FailingSymbolResolver { + fn resolve_symbol(&self, symbol: &str) -> Result, RevsetResolutionError> { + Err(RevsetResolutionError::NoSuchRevision(format!( + "Won't resolve symbol {symbol:?}. When creating revsets programmatically, avoid using \ + RevsetExpression::symbol(); use RevsetExpression::commits() instead." + ))) + } +} + /// Resolves the "root" and "@" symbols, branches, remote branches, tags, git /// refs, and full and abbreviated commit and change ids. pub struct DefaultSymbolResolver<'a> { diff --git a/lib/tests/test_revset.rs b/lib/tests/test_revset.rs index 3899b9f5a2..a4c72689d0 100644 --- a/lib/tests/test_revset.rs +++ b/lib/tests/test_revset.rs @@ -40,8 +40,9 @@ fn revset_for_commits<'index>( repo: &'index dyn Repo, commits: &[&Commit], ) -> Box + 'index> { + let symbol_resolver = DefaultSymbolResolver::new(repo, None); RevsetExpression::commits(commits.iter().map(|commit| commit.id().clone()).collect()) - .resolve(repo) + .resolve_user_expression(repo, &symbol_resolver) .unwrap() .evaluate(repo) .unwrap() @@ -173,8 +174,9 @@ fn test_resolve_symbol_commit_id() { // Test present() suppresses only NoSuchRevision error assert_eq!(resolve_commit_ids(repo.as_ref(), "present(foo)"), []); + let symbol_resolver = DefaultSymbolResolver::new(repo.as_ref(), None); assert_matches!( - optimize(parse("present(04)", &RevsetAliasesMap::new(), None).unwrap()).resolve(repo.as_ref()), + optimize(parse("present(04)", &RevsetAliasesMap::new(), None).unwrap()).resolve_user_expression(repo.as_ref(), &symbol_resolver), Err(RevsetResolutionError::AmbiguousIdPrefix(s)) if s == "04" ); assert_eq!( @@ -504,7 +506,10 @@ fn test_resolve_symbol_git_refs() { fn resolve_commit_ids(repo: &dyn Repo, revset_str: &str) -> Vec { let expression = optimize(parse(revset_str, &RevsetAliasesMap::new(), None).unwrap()); - let expression = expression.resolve(repo).unwrap(); + let symbol_resolver = DefaultSymbolResolver::new(repo, None); + let expression = expression + .resolve_user_expression(repo, &symbol_resolver) + .unwrap(); expression.evaluate(repo).unwrap().iter().collect() }