ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

revset: rename resolve() to resolve_programmatic()

Browse source 
`RevsetExpression::resolve()` is meant for programmatically created
expressions. In particular, it may not contain symbols. Let's try to
clarify that by renaming the function and documenting it.
This commit is contained in:
Martin von Zweigbergk 2023-11-24 10:12:34 -08:00 committed by Martin von Zweigbergk
parent b37293fa68
commit f27f52984e
9 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cli/src/commands/new.rs
View file

@ -116,7 +116,7 @@ Please use `jj new 'all:x|y'` instead of `jj new --allow-large-revsets x y`.",
let new_parents = new_children.parents();
if let Some(commit_id) = new_children
.dag_range_to(&new_parents)
.resolve(tx.repo())?
.resolve_programmatic(tx.repo())?
.evaluate(tx.repo())?
.iter()
.next()
@ -128,7 +128,7 @@ Please use `jj new 'all:x|y'` instead of `jj new --allow-large-revsets x y`.",
)));
}
let mut new_parents_commits: Vec<Commit> = new_parents
.resolve(tx.repo())?
.resolve_programmatic(tx.repo())?
.evaluate(tx.repo())?
.iter()
.commits(tx.repo().store())
@ -163,7 +163,7 @@ Please use `jj new 'all:x|y'` instead of `jj new --allow-large-revsets x y`.",
// Exclude children that are ancestors of the new commit
let to_rebase = old_parents.children().minus(&old_parents.ancestors());
to_rebase
.resolve(tx.base_repo().as_ref())?
.resolve_programmatic(tx.base_repo().as_ref())?
.evaluate(tx.base_repo().as_ref())?
.iter()
.commits(tx.base_repo().store())
@ -184,7 +184,7 @@ Please use `jj new 'all:x|y'` instead of `jj new --allow-large-revsets x y`.",
let commit_parents = RevsetExpression::commits(child_commit.parent_ids().to_owned());
let new_parents = commit_parents.minus(&old_parents);
let mut new_parent_commits: Vec<Commit> = new_parents
.resolve(tx.base_repo().as_ref())?
.resolve_programmatic(tx.base_repo().as_ref())?
.evaluate(tx.base_repo().as_ref())?
.iter()
.commits(tx.base_repo().store())

2
cli/src/commands/next.rs
View file

@ -90,7 +90,7 @@ pub(crate) fn cmd_next(
descendant_expression.minus(&RevsetExpression::commit(current_wc_id.clone()).descendants())
};
let targets: Vec<Commit> = target_expression
.resolve(workspace_command.repo().as_ref())?
.resolve_programmatic(workspace_command.repo().as_ref())?
.evaluate(workspace_command.repo().as_ref())?
.iter()
.commits(workspace_command.repo().store())

2
cli/src/commands/prev.rs
View file

@ -88,7 +88,7 @@ pub(crate) fn cmd_prev(
ancestor_expression.minus(&RevsetExpression::commit(current_wc_id.clone()))
};
let targets: Vec<_> = target_revset
.resolve(workspace_command.repo().as_ref())?
.resolve_programmatic(workspace_command.repo().as_ref())?
.evaluate(workspace_command.repo().as_ref())?
.iter()
.commits(workspace_command.repo().store())

6
cli/src/commands/rebase.rs
View file

@ -236,7 +236,7 @@ fn rebase_branch(
.range(&RevsetExpression::commits(branch_commit_ids))
.roots();
let root_commits: IndexSet<_> = roots_expression
.resolve(workspace_command.repo().as_ref())
.resolve_programmatic(workspace_command.repo().as_ref())
.unwrap()
.evaluate(workspace_command.repo().as_ref())
.unwrap()
@ -312,7 +312,7 @@ fn rebase_revision(
let children_expression = RevsetExpression::commit(old_commit.id().clone()).children();
let child_commits: Vec<_> = children_expression
.resolve(workspace_command.repo().as_ref())
.resolve_programmatic(workspace_command.repo().as_ref())
.unwrap()
.evaluate(workspace_command.repo().as_ref())
.unwrap()
@ -353,7 +353,7 @@ fn rebase_revision(
.ancestors(),
);
let new_child_parents: Vec<Commit> = new_child_parents_expression
.resolve(tx.base_repo().as_ref())
.resolve_programmatic(tx.base_repo().as_ref())
.unwrap()
.evaluate(tx.base_repo().as_ref())
.unwrap()

2
lib/src/git.rs
View file

@ -371,7 +371,7 @@ fn abandon_unreachable_commits(
.range(&RevsetExpression::commits(hidable_git_heads))
.intersection(&RevsetExpression::visible_heads().ancestors());
let abandoned_commits = revset::optimize(abandoned_expression)
.resolve(mut_repo)
.resolve_programmatic(mut_repo)
.unwrap()
.evaluate(mut_repo)
.unwrap()

6
lib/src/repo.rs
View file

@ -265,7 +265,7 @@ impl ReadonlyRepo {
.change_id_index
.get_or_init(|| {
let revset: Box<dyn Revset<'a>> = RevsetExpression::all()
.resolve(self)
.resolve_programmatic(self)
.unwrap()
.evaluate(self)
.unwrap();
@ -1326,7 +1326,7 @@ impl Repo for MutableRepo {
fn resolve_change_id_prefix(&self, prefix: &HexPrefix) -> PrefixResolution<Vec<CommitId>> {
let revset = RevsetExpression::all()
.resolve(self)
.resolve_programmatic(self)
.unwrap()
.evaluate(self)
.unwrap();
@ -1336,7 +1336,7 @@ impl Repo for MutableRepo {
fn shortest_unique_change_id_prefix_len(&self, target_id: &ChangeId) -> usize {
let revset = RevsetExpression::all()
.resolve(self)
.resolve_programmatic(self)
.unwrap()
.evaluate(self)
.unwrap();

11
lib/src/revset.rs
View file

@ -633,7 +633,12 @@ impl RevsetExpression {
Rc::new(RevsetExpression::Difference(self.clone(), other.clone()))
}
pub fn resolve(
/// Resolve a programmatically created revset expression. In particular, the
/// expression must not contain any symbols (branches, tags, change/commit
/// prefixes). Callers must not include `RevsetExpression::symbol()` in
/// the expression, and should instead resolve symbols to `CommitId`s and
/// pass them into `RevsetExpression::commits()`.
pub fn resolve_programmatic(
self: Rc<Self>,
repo: &dyn Repo,
) -> Result<ResolvedExpression, RevsetResolutionError> {
@ -642,6 +647,8 @@ impl RevsetExpression {
.map(|expression| resolve_visibility(repo, &expression))
}
/// Resolve a user-provided expression. Symbols will be resolved using the
/// provided `SymbolResolver`.
pub fn resolve_user_expression(
self: Rc<Self>,
repo: &dyn Repo,
@ -1932,7 +1939,7 @@ pub fn walk_revs<'index>(
) -> Result<Box<dyn Revset<'index> + 'index>, RevsetEvaluationError> {
RevsetExpression::commits(unwanted.to_vec())
.range(&RevsetExpression::commits(wanted.to_vec()))
.resolve(repo)
.resolve_programmatic(repo)
.unwrap()
.evaluate(repo)
}

4
lib/src/rewrite.rs
View file

@ -289,7 +289,7 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
.parents()
.minus(&old_commits_expression);
let heads_to_add = heads_to_add_expression
.resolve(mut_repo)
.resolve_programmatic(mut_repo)
.unwrap()
.evaluate(mut_repo)
.unwrap()
@ -298,7 +298,7 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
let to_visit_expression = old_commits_expression.descendants();
let to_visit_revset = to_visit_expression
.resolve(mut_repo)
.resolve_programmatic(mut_repo)
.unwrap()
.evaluate(mut_repo)
.unwrap();

6
lib/tests/test_revset.rs
View file

@ -350,7 +350,7 @@ fn test_resolve_working_copy() {
// Cannot resolve a working-copy commit for an unknown workspace
assert_matches!(
RevsetExpression::working_copy(ws1.clone()).resolve(mut_repo),
RevsetExpression::working_copy(ws1.clone()).resolve_programmatic(mut_repo),
Err(RevsetResolutionError::WorkspaceMissingWorkingCopy { name }) if name == "ws1"
);
@ -363,7 +363,7 @@ fn test_resolve_working_copy() {
.unwrap();
let resolve = |ws_id: WorkspaceId| -> Vec<CommitId> {
RevsetExpression::working_copy(ws_id)
.resolve(mut_repo)
.resolve_programmatic(mut_repo)
.unwrap()
.evaluate(mut_repo)
.unwrap()
@ -2637,7 +2637,7 @@ fn test_evaluate_expression_file() {
let expression =
RevsetExpression::filter(RevsetFilterPredicate::File(Some(vec![file_path.clone()])));
let revset = expression
.resolve(mut_repo)
.resolve_programmatic(mut_repo)
.unwrap()
.evaluate(mut_repo)
.unwrap();