mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-28 09:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

cli: add stub function to parse revset with workspace context

Browse source 
parse() will take a workspace context to resolve file paths.
This commit is contained in:
Yuya Nishihara 2022-11-01 16:14:21 +09:00
parent 4ebeb95203
commit 2193d7768d
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cli_util.rs
View file

@ -17,6 +17,7 @@ use std::env::ArgsOs;
use std::ffi::OsString;
use std::fmt::Debug;
use std::path::PathBuf;
use std::rc::Rc;
use std::sync::Arc;
use clap;
@ -569,7 +570,7 @@ impl WorkspaceCommandHelper {
}
pub fn resolve_single_rev(&self, revision_str: &str) -> Result<Commit, CommandError> {
let revset_expression = revset::optimize(revset::parse(revision_str)?);
let revset_expression = self.parse_revset(revision_str)?;
let revset = self.evaluate_revset(&revset_expression)?;
let mut iter = revset.iter().commits(self.repo.store());
match iter.next() {
@ -591,7 +592,7 @@ impl WorkspaceCommandHelper {
}
pub fn resolve_revset(&self, revision_str: &str) -> Result<Vec<Commit>, CommandError> {
let revset_expression = revset::optimize(revset::parse(revision_str)?);
let revset_expression = self.parse_revset(revision_str)?;
let revset = self.evaluate_revset(&revset_expression)?;
Ok(revset
.iter()
@ -600,16 +601,27 @@ impl WorkspaceCommandHelper {
.collect())
}
pub fn parse_revset(
&self,
revision_str: &str,
) -> Result<Rc<RevsetExpression>, RevsetParseError> {
let expression = revset::parse(revision_str)?;
Ok(revset::optimize(expression))
}
pub fn evaluate_revset<'repo>(
&'repo self,
revset_expression: &RevsetExpression,
) -> Result<Box<dyn Revset<'repo> + 'repo>, RevsetError> {
let workspace_ctx = RevsetWorkspaceContext {
revset_expression.evaluate(self.repo.as_repo_ref(), Some(&self.revset_context()))
}
fn revset_context(&self) -> RevsetWorkspaceContext {
RevsetWorkspaceContext {
cwd: &self.cwd,
workspace_id: self.workspace.workspace_id(),
workspace_root: self.workspace.workspace_root(),
};
revset_expression.evaluate(self.repo.as_repo_ref(), Some(&workspace_ctx))
}
}
pub fn check_rewriteable(&self, commit: &Commit) -> Result<(), CommandError> {

5
src/commands.rs
View file

@ -2076,9 +2076,8 @@ fn cmd_log(ui: &mut Ui, command: &CommandHelper, args: &LogArgs) -> Result<(), C
let workspace_command = command.workspace_helper(ui)?;
let default_revset = ui.settings().default_revset();
let revset_expression = revset::optimize(revset::parse(
args.revisions.as_ref().unwrap_or(&default_revset),
)?);
let revset_expression =
workspace_command.parse_revset(args.revisions.as_ref().unwrap_or(&default_revset))?;
let repo = workspace_command.repo();
let workspace_id = workspace_command.workspace_id();
let checkout_id = repo.view().get_wc_commit_id(&workspace_id);