mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 23:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

cli: pass UserSettings in to load_revset_aliases() explicitly

Browse source
This commit is contained in:
Yuya Nishihara 2023-01-04 18:20:11 +09:00
parent 20bed8f80e
commit 4b1008271b
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cli_util.rs
View file

@ -412,6 +412,8 @@ impl WorkspaceCommandHelper {
global_args: &GlobalArgs, global_args: &GlobalArgs,
repo: Arc<ReadonlyRepo>, repo: Arc<ReadonlyRepo>,
) -> Result<Self, CommandError> { ) -> Result<Self, CommandError> {
let settings = ui.settings().clone();
let revset_aliases_map = load_revset_aliases(ui, &settings)?;
let loaded_at_head = &global_args.at_operation == "@"; let loaded_at_head = &global_args.at_operation == "@";
let may_update_working_copy = loaded_at_head && !global_args.no_commit_working_copy; let may_update_working_copy = loaded_at_head && !global_args.no_commit_working_copy;
let mut working_copy_shared_with_git = false; let mut working_copy_shared_with_git = false;
@ -427,10 +429,10 @@ impl WorkspaceCommandHelper {
cwd: ui.cwd().to_owned(), cwd: ui.cwd().to_owned(),
string_args, string_args,
global_args: global_args.clone(), global_args: global_args.clone(),
settings: ui.settings().clone(), settings,
workspace, workspace,
repo, repo,
revset_aliases_map: load_revset_aliases(ui)?, revset_aliases_map,
may_update_working_copy, may_update_working_copy,
working_copy_shared_with_git, working_copy_shared_with_git,
}) })
@ -1173,10 +1175,13 @@ fn resolve_single_op_from_store(
} }
} }
fn load_revset_aliases(ui: &mut Ui) -> Result<RevsetAliasesMap, CommandError> { fn load_revset_aliases(
ui: &mut Ui,
settings: &UserSettings,
) -> Result<RevsetAliasesMap, CommandError> {
const TABLE_KEY: &str = "revset-aliases"; const TABLE_KEY: &str = "revset-aliases";
let mut aliases_map = RevsetAliasesMap::new(); let mut aliases_map = RevsetAliasesMap::new();
if let Ok(table) = ui.settings().config().get_table(TABLE_KEY) { if let Ok(table) = settings.config().get_table(TABLE_KEY) {
for (decl, value) in table.into_iter().sorted_by(|a, b| a.0.cmp(&b.0)) { for (decl, value) in table.into_iter().sorted_by(|a, b| a.0.cmp(&b.0)) {
let r = value let r = value
.into_string() .into_string()