Mercurial > hg
annotate rust/hg-core/src/config/config.rs @ 47950:6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
This new method is not used yet outside of its own unit tests,
so this changeset should make no observable change.
The Rust parser implementation attempts to exactly replicate the behavior of
the Python one, even in edge cases where that behavior is… surprising.
New unit tests capture some of these edge cases.
This started as a line-by-line port. The main changes are:
* Pass around a parser mode enum instead of parser functions
* Inline the whole parser into one function
* Use `[u8]::get` which returns an `Option`,
instead of indexing after explicitly checking the length.
Differential Revision: https://phab.mercurial-scm.org/D11389
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Wed, 17 Feb 2021 20:49:53 +0100 |
parents | 3237ed4dcda4 |
children | cff41e168c25 |
rev | line source |
---|---|
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
1 // config.rs |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
2 // |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
3 // Copyright 2020 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
4 // Valentin Gatien-Baron, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
5 // Raphaël Gomès <rgomes@octobus.net> |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
6 // |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
7 // This software may be used and distributed according to the terms of the |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
8 // GNU General Public License version 2 or any later version. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
9 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
10 use super::layer; |
46602
a687a7f27951
rust: Move config value parsing functions to a new module
Simon Sapin <simon.sapin@octobus.net>
parents:
46599
diff
changeset
|
11 use super::values; |
46447
0cb1b02228a6
rust: use HgError in ConfigError
Simon Sapin <simon.sapin@octobus.net>
parents:
46446
diff
changeset
|
12 use crate::config::layer::{ |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
13 ConfigError, ConfigLayer, ConfigOrigin, ConfigValue, |
46447
0cb1b02228a6
rust: use HgError in ConfigError
Simon Sapin <simon.sapin@octobus.net>
parents:
46446
diff
changeset
|
14 }; |
46596
d2e61f00ee9d
rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents:
46504
diff
changeset
|
15 use crate::utils::files::get_bytes_from_os_str; |
46734
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
16 use crate::utils::SliceExt; |
46499
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
17 use format_bytes::{write_bytes, DisplayBytes}; |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
18 use std::collections::HashSet; |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
19 use std::env; |
46797
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
20 use std::fmt; |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
21 use std::path::{Path, PathBuf}; |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
22 use std::str; |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
23 |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
24 use crate::errors::{HgResultExt, IoResultExt}; |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
25 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
26 /// Holds the config values for the current repository |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
27 /// TODO update this docstring once we support more sources |
46741
25e3dac511f0
rhg: Add support for the HGRCSKIPREPO environment variable
Simon Sapin <simon.sapin@octobus.net>
parents:
46734
diff
changeset
|
28 #[derive(Clone)] |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
29 pub struct Config { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
30 layers: Vec<layer::ConfigLayer>, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
31 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
32 |
46499
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
33 impl DisplayBytes for Config { |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
34 fn display_bytes( |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
35 &self, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
36 out: &mut dyn std::io::Write, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
37 ) -> std::io::Result<()> { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
38 for (index, layer) in self.layers.iter().rev().enumerate() { |
46499
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
39 write_bytes!( |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
40 out, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
41 b"==== Layer {} (trusted: {}) ====\n{}", |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
42 index, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
43 if layer.trusted { |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
44 &b"yes"[..] |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
45 } else { |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
46 &b"no"[..] |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
47 }, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46486
diff
changeset
|
48 layer |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
49 )?; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
50 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
51 Ok(()) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
52 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
53 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
54 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
55 pub enum ConfigSource { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
56 /// Absolute path to a config file |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
57 AbsPath(PathBuf), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
58 /// Already parsed (from the CLI, env, Python resources, etc.) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
59 Parsed(layer::ConfigLayer), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
60 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
61 |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
62 #[derive(Debug)] |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
63 pub struct ConfigValueParseError { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
64 pub origin: ConfigOrigin, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
65 pub line: Option<usize>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
66 pub section: Vec<u8>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
67 pub item: Vec<u8>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
68 pub value: Vec<u8>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
69 pub expected_type: &'static str, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
70 } |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
71 |
46797
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
72 impl fmt::Display for ConfigValueParseError { |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
73 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
74 // TODO: add origin and line number information, here and in |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
75 // corresponding python code |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
76 write!( |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
77 f, |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
78 "config error: {}.{} is not a {} ('{}')", |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
79 String::from_utf8_lossy(&self.section), |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
80 String::from_utf8_lossy(&self.item), |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
81 self.expected_type, |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
82 String::from_utf8_lossy(&self.value) |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
83 ) |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
84 } |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
85 } |
bcdcb4423ae3
rhg: Add more conversions between error types
Simon Sapin <simon.sapin@octobus.net>
parents:
46741
diff
changeset
|
86 |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
87 impl Config { |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
88 /// Load system and user configuration from various files. |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
89 /// |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
90 /// This is also affected by some environment variables. |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
91 pub fn load_non_repo() -> Result<Self, ConfigError> { |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
92 let mut config = Self { layers: Vec::new() }; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
93 let opt_rc_path = env::var_os("HGRCPATH"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
94 // HGRCPATH replaces system config |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
95 if opt_rc_path.is_none() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
96 config.add_system_config()? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
97 } |
46722
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
98 |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
99 config.add_for_environment_variable("EDITOR", b"ui", b"editor"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
100 config.add_for_environment_variable("VISUAL", b"ui", b"editor"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
101 config.add_for_environment_variable("PAGER", b"pager", b"pager"); |
46722
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
102 |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
103 // These are set by `run-tests.py --rhg` to enable fallback for the |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
104 // entire test suite. Alternatives would be setting configuration |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
105 // through `$HGRCPATH` but some tests override that, or changing the |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
106 // `hg` shell alias to include `--config` but that disrupts tests that |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
107 // print command lines and check expected output. |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
108 config.add_for_environment_variable( |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
109 "RHG_ON_UNSUPPORTED", |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
110 b"rhg", |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
111 b"on-unsupported", |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
112 ); |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
113 config.add_for_environment_variable( |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
114 "RHG_FALLBACK_EXECUTABLE", |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
115 b"rhg", |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
116 b"fallback-executable", |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
117 ); |
08a35cec14d4
rhg: Add environment variables for fallback configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46602
diff
changeset
|
118 |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
119 // HGRCPATH replaces user config |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
120 if opt_rc_path.is_none() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
121 config.add_user_config()? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
122 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
123 if let Some(rc_path) = &opt_rc_path { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
124 for path in env::split_paths(rc_path) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
125 if !path.as_os_str().is_empty() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
126 if path.is_dir() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
127 config.add_trusted_dir(&path)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
128 } else { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
129 config.add_trusted_file(&path)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
130 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
131 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
132 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
133 } |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
134 Ok(config) |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
135 } |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
136 |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
137 pub fn load_cli_args_config( |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
138 &mut self, |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
139 cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>, |
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
140 ) -> Result<(), ConfigError> { |
46504
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46499
diff
changeset
|
141 if let Some(layer) = ConfigLayer::parse_cli_args(cli_config_args)? { |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
142 self.layers.push(layer) |
46504
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46499
diff
changeset
|
143 } |
47406
3237ed4dcda4
rhg: split non_repo_config and `--config` loading in different functions
Pulkit Goyal <7895pulkit@gmail.com>
parents:
47189
diff
changeset
|
144 Ok(()) |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
145 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
146 |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
147 fn add_trusted_dir(&mut self, path: &Path) -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
148 if let Some(entries) = std::fs::read_dir(path) |
46599
1f55cd5b292f
rust: Add a log file rotation utility
Simon Sapin <simon.sapin@octobus.net>
parents:
46598
diff
changeset
|
149 .when_reading_file(path) |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
150 .io_not_found_as_none()? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
151 { |
46732
60fe9ebae29b
rhg: Sort config files when adding a directory
Simon Sapin <simon.sapin@octobus.net>
parents:
46722
diff
changeset
|
152 let mut file_paths = entries |
60fe9ebae29b
rhg: Sort config files when adding a directory
Simon Sapin <simon.sapin@octobus.net>
parents:
46722
diff
changeset
|
153 .map(|result| { |
60fe9ebae29b
rhg: Sort config files when adding a directory
Simon Sapin <simon.sapin@octobus.net>
parents:
46722
diff
changeset
|
154 result.when_reading_file(path).map(|entry| entry.path()) |
60fe9ebae29b
rhg: Sort config files when adding a directory
Simon Sapin <simon.sapin@octobus.net>
parents:
46722
diff
changeset
|
155 }) |
60fe9ebae29b
rhg: Sort config files when adding a directory
Simon Sapin <simon.sapin@octobus.net>
parents:
46722
diff
changeset
|
156 .collect::<Result<Vec<_>, _>>()?; |
60fe9ebae29b
rhg: Sort config files when adding a directory
Simon Sapin <simon.sapin@octobus.net>
parents:
46722
diff
changeset
|
157 file_paths.sort(); |
60fe9ebae29b
rhg: Sort config files when adding a directory
Simon Sapin <simon.sapin@octobus.net>
parents:
46722
diff
changeset
|
158 for file_path in &file_paths { |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
159 if file_path.extension() == Some(std::ffi::OsStr::new("rc")) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
160 self.add_trusted_file(&file_path)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
161 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
162 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
163 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
164 Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
165 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
166 |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
167 fn add_trusted_file(&mut self, path: &Path) -> Result<(), ConfigError> { |
46599
1f55cd5b292f
rust: Add a log file rotation utility
Simon Sapin <simon.sapin@octobus.net>
parents:
46598
diff
changeset
|
168 if let Some(data) = std::fs::read(path) |
1f55cd5b292f
rust: Add a log file rotation utility
Simon Sapin <simon.sapin@octobus.net>
parents:
46598
diff
changeset
|
169 .when_reading_file(path) |
1f55cd5b292f
rust: Add a log file rotation utility
Simon Sapin <simon.sapin@octobus.net>
parents:
46598
diff
changeset
|
170 .io_not_found_as_none()? |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
171 { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
172 self.layers.extend(ConfigLayer::parse(path, &data)?) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
173 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
174 Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
175 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
176 |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
177 fn add_for_environment_variable( |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
178 &mut self, |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
179 var: &str, |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
180 section: &[u8], |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
181 key: &[u8], |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
182 ) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
183 if let Some(value) = env::var_os(var) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
184 let origin = layer::ConfigOrigin::Environment(var.into()); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
185 let mut layer = ConfigLayer::new(origin); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
186 layer.add( |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
187 section.to_owned(), |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
188 key.to_owned(), |
46596
d2e61f00ee9d
rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents:
46504
diff
changeset
|
189 get_bytes_from_os_str(value), |
46483
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
190 None, |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
191 ); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
192 self.layers.push(layer) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
193 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
194 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
195 |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
196 #[cfg(unix)] // TODO: other platforms |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
197 fn add_system_config(&mut self) -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
198 let mut add_for_prefix = |prefix: &Path| -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
199 let etc = prefix.join("etc").join("mercurial"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
200 self.add_trusted_file(&etc.join("hgrc"))?; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
201 self.add_trusted_dir(&etc.join("hgrc.d")) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
202 }; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
203 let root = Path::new("/"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
204 // TODO: use `std::env::args_os().next().unwrap()` a.k.a. argv[0] |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
205 // instead? TODO: can this be a relative path? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
206 let hg = crate::utils::current_exe()?; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
207 // TODO: this order (per-installation then per-system) matches |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
208 // `systemrcpath()` in `mercurial/scmposix.py`, but |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
209 // `mercurial/helptext/config.txt` suggests it should be reversed |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
210 if let Some(installation_prefix) = hg.parent().and_then(Path::parent) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
211 if installation_prefix != root { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
212 add_for_prefix(&installation_prefix)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
213 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
214 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
215 add_for_prefix(root)?; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
216 Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
217 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
218 |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
219 #[cfg(unix)] // TODO: other plateforms |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
220 fn add_user_config(&mut self) -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
221 let opt_home = home::home_dir(); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
222 if let Some(home) = &opt_home { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
223 self.add_trusted_file(&home.join(".hgrc"))? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
224 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
225 let darwin = cfg!(any(target_os = "macos", target_os = "ios")); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
226 if !darwin { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
227 if let Some(config_home) = env::var_os("XDG_CONFIG_HOME") |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
228 .map(PathBuf::from) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
229 .or_else(|| opt_home.map(|home| home.join(".config"))) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
230 { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
231 self.add_trusted_file(&config_home.join("hg").join("hgrc"))? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
232 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
233 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
234 Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
235 } |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46481
diff
changeset
|
236 |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
237 /// Loads in order, which means that the precedence is the same |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
238 /// as the order of `sources`. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
239 pub fn load_from_explicit_sources( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
240 sources: Vec<ConfigSource>, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
241 ) -> Result<Self, ConfigError> { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
242 let mut layers = vec![]; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
243 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
244 for source in sources.into_iter() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
245 match source { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
246 ConfigSource::Parsed(c) => layers.push(c), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
247 ConfigSource::AbsPath(c) => { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
248 // TODO check if it should be trusted |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
249 // mercurial/ui.py:427 |
46481
0d734c0ae1cf
rust: replace read_whole_file with std::fs::read
Simon Sapin <simon.sapin@octobus.net>
parents:
46447
diff
changeset
|
250 let data = match std::fs::read(&c) { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
251 Err(_) => continue, // same as the python code |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
252 Ok(data) => data, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
253 }; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
254 layers.extend(ConfigLayer::parse(&c, &data)?) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
255 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
256 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
257 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
258 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
259 Ok(Config { layers }) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
260 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
261 |
46486
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
262 /// Loads the per-repository config into a new `Config` which is combined |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
263 /// with `self`. |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
264 pub(crate) fn combine_with_repo( |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
265 &self, |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
266 repo_config_files: &[PathBuf], |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
267 ) -> Result<Self, ConfigError> { |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
268 let (cli_layers, other_layers) = self |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
269 .layers |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
270 .iter() |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
271 .cloned() |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
272 .partition(ConfigLayer::is_from_command_line); |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
273 |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
274 let mut repo_config = Self { |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
275 layers: other_layers, |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
276 }; |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
277 for path in repo_config_files { |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
278 // TODO: check if this file should be trusted: |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
279 // `mercurial/ui.py:427` |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
280 repo_config.add_trusted_file(path)?; |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
281 } |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
282 repo_config.layers.extend(cli_layers); |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46483
diff
changeset
|
283 Ok(repo_config) |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
284 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
285 |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
286 fn get_parse<'config, T: 'config>( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
287 &'config self, |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
288 section: &[u8], |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
289 item: &[u8], |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
290 expected_type: &'static str, |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
291 parse: impl Fn(&'config [u8]) -> Option<T>, |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
292 ) -> Result<Option<T>, ConfigValueParseError> { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
293 match self.get_inner(§ion, &item) { |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
294 Some((layer, v)) => match parse(&v.bytes) { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
295 Some(b) => Ok(Some(b)), |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
296 None => Err(ConfigValueParseError { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
297 origin: layer.origin.to_owned(), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
298 line: v.line, |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
299 value: v.bytes.to_owned(), |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
300 section: section.to_owned(), |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
301 item: item.to_owned(), |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
302 expected_type, |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
303 }), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
304 }, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
305 None => Ok(None), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
306 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
307 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
308 |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
309 /// Returns an `Err` if the first value found is not a valid UTF-8 string. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
310 /// Otherwise, returns an `Ok(value)` if found, or `None`. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
311 pub fn get_str( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
312 &self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
313 section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
314 item: &[u8], |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
315 ) -> Result<Option<&str>, ConfigValueParseError> { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
316 self.get_parse(section, item, "ASCII or UTF-8 string", |value| { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
317 str::from_utf8(value).ok() |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
318 }) |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
319 } |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
320 |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
321 /// Returns an `Err` if the first value found is not a valid unsigned |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
322 /// integer. Otherwise, returns an `Ok(value)` if found, or `None`. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
323 pub fn get_u32( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
324 &self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
325 section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
326 item: &[u8], |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
327 ) -> Result<Option<u32>, ConfigValueParseError> { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
328 self.get_parse(section, item, "valid integer", |value| { |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
329 str::from_utf8(value).ok()?.parse().ok() |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
330 }) |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
331 } |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
332 |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
333 /// Returns an `Err` if the first value found is not a valid file size |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
334 /// value such as `30` (default unit is bytes), `7 MB`, or `42.5 kb`. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
335 /// Otherwise, returns an `Ok(value_in_bytes)` if found, or `None`. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
336 pub fn get_byte_size( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
337 &self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
338 section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
339 item: &[u8], |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
340 ) -> Result<Option<u64>, ConfigValueParseError> { |
46602
a687a7f27951
rust: Move config value parsing functions to a new module
Simon Sapin <simon.sapin@octobus.net>
parents:
46599
diff
changeset
|
341 self.get_parse(section, item, "byte quantity", values::parse_byte_size) |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
342 } |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
343 |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
344 /// Returns an `Err` if the first value found is not a valid boolean. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
345 /// Otherwise, returns an `Ok(option)`, where `option` is the boolean if |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
346 /// found, or `None`. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
347 pub fn get_option( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
348 &self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
349 section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
350 item: &[u8], |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
351 ) -> Result<Option<bool>, ConfigValueParseError> { |
46602
a687a7f27951
rust: Move config value parsing functions to a new module
Simon Sapin <simon.sapin@octobus.net>
parents:
46599
diff
changeset
|
352 self.get_parse(section, item, "boolean", values::parse_bool) |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
353 } |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
354 |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
355 /// Returns the corresponding boolean in the config. Returns `Ok(false)` |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
356 /// if the value is not found, an `Err` if it's not a valid boolean. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
357 pub fn get_bool( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
358 &self, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
359 section: &[u8], |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
360 item: &[u8], |
46598
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46597
diff
changeset
|
361 ) -> Result<bool, ConfigValueParseError> { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
362 Ok(self.get_option(section, item)?.unwrap_or(false)) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
363 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
364 |
46734
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
365 /// Returns the corresponding list-value in the config if found, or `None`. |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
366 /// |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
367 /// This is appropriate for new configuration keys. The value syntax is |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
368 /// **not** the same as most existing list-valued config, which has Python |
47189
b0e92313107e
parselist: move the function from config to stringutil
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46797
diff
changeset
|
369 /// parsing implemented in `parselist()` in |
b0e92313107e
parselist: move the function from config to stringutil
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46797
diff
changeset
|
370 /// `mercurial/utils/stringutil.py`. Faithfully porting that parsing |
b0e92313107e
parselist: move the function from config to stringutil
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46797
diff
changeset
|
371 /// algorithm to Rust (including behavior that are arguably bugs) |
b0e92313107e
parselist: move the function from config to stringutil
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46797
diff
changeset
|
372 /// turned out to be non-trivial and hasn’t been completed as of this |
b0e92313107e
parselist: move the function from config to stringutil
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46797
diff
changeset
|
373 /// writing. |
46734
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
374 /// |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
375 /// Instead, the "simple" syntax is: split on comma, then trim leading and |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
376 /// trailing whitespace of each component. Quotes or backslashes are not |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
377 /// interpreted in any way. Commas are mandatory between values. Values |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
378 /// that contain a comma are not supported. |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
379 pub fn get_simple_list( |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
380 &self, |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
381 section: &[u8], |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
382 item: &[u8], |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
383 ) -> Option<impl Iterator<Item = &[u8]>> { |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
384 self.get(section, item).map(|value| { |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
385 value |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
386 .split(|&byte| byte == b',') |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
387 .map(|component| component.trim()) |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
388 }) |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
389 } |
1a036d33bc18
rhg: Add an allow-list of ignored extensions
Simon Sapin <simon.sapin@octobus.net>
parents:
46733
diff
changeset
|
390 |
47950
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
391 /// If there is an `item` value in `section`, parse and return a list of |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
392 /// byte strings. |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
393 pub fn get_list( |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
394 &self, |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
395 section: &[u8], |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
396 item: &[u8], |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
397 ) -> Option<Vec<Vec<u8>>> { |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
398 self.get(section, item).map(values::parse_list) |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
399 } |
6961eca0b3ee
rhg: Port Python’s `ui.configlist` as `Config::get_list`
Simon Sapin <simon.sapin@octobus.net>
parents:
47406
diff
changeset
|
400 |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
401 /// Returns the raw value bytes of the first one found, or `None`. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
402 pub fn get(&self, section: &[u8], item: &[u8]) -> Option<&[u8]> { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
403 self.get_inner(section, item) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
404 .map(|(_, value)| value.bytes.as_ref()) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
405 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
406 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
407 /// Returns the layer and the value of the first one found, or `None`. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
408 fn get_inner( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
409 &self, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
410 section: &[u8], |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
411 item: &[u8], |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
412 ) -> Option<(&ConfigLayer, &ConfigValue)> { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
413 for layer in self.layers.iter().rev() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
414 if !layer.trusted { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
415 continue; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
416 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
417 if let Some(v) = layer.get(§ion, &item) { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
418 return Some((&layer, v)); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
419 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
420 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
421 None |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
422 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
423 |
46733
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
424 /// Return all keys defined for the given section |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
425 pub fn get_section_keys(&self, section: &[u8]) -> HashSet<&[u8]> { |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
426 self.layers |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
427 .iter() |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
428 .flat_map(|layer| layer.iter_keys(section)) |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
429 .collect() |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
430 } |
1bac7764ceef
rhg: Fall back to Python if unsupported extensions are enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
46732
diff
changeset
|
431 |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
432 /// Get raw values bytes from all layers (even untrusted ones) in order |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
433 /// of precedence. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
434 #[cfg(test)] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
435 fn get_all(&self, section: &[u8], item: &[u8]) -> Vec<&[u8]> { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
436 let mut res = vec![]; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
437 for layer in self.layers.iter().rev() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
438 if let Some(v) = layer.get(§ion, &item) { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
439 res.push(v.bytes.as_ref()); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
440 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
441 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
442 res |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
443 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
444 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
445 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
446 #[cfg(test)] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
447 mod tests { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
448 use super::*; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
449 use pretty_assertions::assert_eq; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
450 use std::fs::File; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
451 use std::io::Write; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
452 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
453 #[test] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
454 fn test_include_layer_ordering() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
455 let tmpdir = tempfile::tempdir().unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
456 let tmpdir_path = tmpdir.path(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
457 let mut included_file = |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
458 File::create(&tmpdir_path.join("included.rc")).unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
459 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
460 included_file.write_all(b"[section]\nitem=value1").unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
461 let base_config_path = tmpdir_path.join("base.rc"); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
462 let mut config_file = File::create(&base_config_path).unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
463 let data = |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
464 b"[section]\nitem=value0\n%include included.rc\nitem=value2\n\ |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
465 [section2]\ncount = 4\nsize = 1.5 KB\nnot-count = 1.5\nnot-size = 1 ub"; |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
466 config_file.write_all(data).unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
467 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
468 let sources = vec![ConfigSource::AbsPath(base_config_path)]; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
469 let config = Config::load_from_explicit_sources(sources) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
470 .expect("expected valid config"); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
471 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
472 let (_, value) = config.get_inner(b"section", b"item").unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
473 assert_eq!( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
474 value, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
475 &ConfigValue { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
476 bytes: b"value2".to_vec(), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
477 line: Some(4) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
478 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
479 ); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
480 |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
481 let value = config.get(b"section", b"item").unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
482 assert_eq!(value, b"value2",); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
483 assert_eq!( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
484 config.get_all(b"section", b"item"), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
485 [b"value2", b"value1", b"value0"] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
486 ); |
46597
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
487 |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
488 assert_eq!(config.get_u32(b"section2", b"count").unwrap(), Some(4)); |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
489 assert_eq!( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
490 config.get_byte_size(b"section2", b"size").unwrap(), |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
491 Some(1024 + 512) |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
492 ); |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
493 assert!(config.get_u32(b"section2", b"not-count").is_err()); |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46596
diff
changeset
|
494 assert!(config.get_byte_size(b"section2", b"not-size").is_err()); |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
495 } |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
496 } |