mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-20 03:20:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli_util: extract new_id_prefix_context method

Browse source
This commit is contained in:
Scott Taylor 2024-06-29 20:38:48 -05:00 committed by Scott Taylor
parent 8bf10c8289
commit ddfce6d2c9
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cli/src/cli_util.rs
View file

@ -999,25 +999,28 @@ impl WorkspaceCommandHelper {
) )
} }
fn new_id_prefix_context(&self) -> Result<IdPrefixContext, CommandError> {
let mut context: IdPrefixContext = IdPrefixContext::new(self.revset_extensions.clone());
let revset_string: String = self
.settings
.config()
.get_string("revsets.short-prefixes")
.unwrap_or_else(|_| self.settings.default_revset());
if !revset_string.is_empty() {
let (expression, modifier) =
revset::parse_with_modifier(&revset_string, &self.revset_parse_context()).map_err(
|err| config_error_with_message("Invalid `revsets.short-prefixes`", err),
)?;
let (None | Some(RevsetModifier::All)) = modifier;
context = context.disambiguate_within(revset::optimize(expression));
}
Ok(context)
}
pub fn id_prefix_context(&self) -> Result<&IdPrefixContext, CommandError> { pub fn id_prefix_context(&self) -> Result<&IdPrefixContext, CommandError> {
self.user_repo.id_prefix_context.get_or_try_init(|| { self.user_repo
let mut context: IdPrefixContext = IdPrefixContext::new(self.revset_extensions.clone()); .id_prefix_context
let revset_string: String = self .get_or_try_init(|| self.new_id_prefix_context())
.settings
.config()
.get_string("revsets.short-prefixes")
.unwrap_or_else(|_| self.settings.default_revset());
if !revset_string.is_empty() {
let (expression, modifier) =
revset::parse_with_modifier(&revset_string, &self.revset_parse_context())
.map_err(|err| {
config_error_with_message("Invalid `revsets.short-prefixes`", err)
})?;
let (None | Some(RevsetModifier::All)) = modifier;
context = context.disambiguate_within(revset::optimize(expression));
}
Ok(context)
})
} }
pub fn template_aliases_map(&self) -> &TemplateAliasesMap { pub fn template_aliases_map(&self) -> &TemplateAliasesMap {