author | Simon Sapin <simon.sapin@octobus.net> |
Tue, 16 Feb 2021 15:22:20 +0100 | |
changeset 46637 | bc08c2331f99 |
parent 46636 | 305d74c262de |
child 46638 | 1f55cd5b292f |
permissions | -rw-r--r-- |
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; |
46515
0cb1b02228a6
rust: use HgError in ConfigError
Simon Sapin <simon.sapin@octobus.net>
parents:
46514
diff
changeset
|
11 |
use crate::config::layer::{ |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
12 |
ConfigError, ConfigLayer, ConfigOrigin, ConfigValue, |
46515
0cb1b02228a6
rust: use HgError in ConfigError
Simon Sapin <simon.sapin@octobus.net>
parents:
46514
diff
changeset
|
13 |
}; |
46635
d2e61f00ee9d
rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents:
46556
diff
changeset
|
14 |
use crate::utils::files::get_bytes_from_os_str; |
46551
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
15 |
use format_bytes::{write_bytes, DisplayBytes}; |
46542
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
16 |
use std::env; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
17 |
use std::path::{Path, PathBuf}; |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
18 |
use std::str; |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
19 |
|
46542
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
20 |
use crate::errors::{HgResultExt, IoResultExt}; |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
21 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
22 |
/// 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
|
23 |
/// TODO update this docstring once we support more sources |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
24 |
pub struct Config { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
25 |
layers: Vec<layer::ConfigLayer>, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
26 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
27 |
|
46551
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
28 |
impl DisplayBytes for Config { |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
29 |
fn display_bytes( |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
30 |
&self, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
31 |
out: &mut dyn std::io::Write, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
32 |
) -> std::io::Result<()> { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
33 |
for (index, layer) in self.layers.iter().rev().enumerate() { |
46551
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
34 |
write_bytes!( |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
35 |
out, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
36 |
b"==== Layer {} (trusted: {}) ====\n{}", |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
37 |
index, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
38 |
if layer.trusted { |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
39 |
&b"yes"[..] |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
40 |
} else { |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
41 |
&b"no"[..] |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
42 |
}, |
eace48b4a786
rust: Use the DisplayBytes trait in config printing
Simon Sapin <simon.sapin@octobus.net>
parents:
46545
diff
changeset
|
43 |
layer |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
44 |
)?; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
45 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
46 |
Ok(()) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
47 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
48 |
} |
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 |
pub enum ConfigSource { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
51 |
/// Absolute path to a config file |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
52 |
AbsPath(PathBuf), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
53 |
/// 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
|
54 |
Parsed(layer::ConfigLayer), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
55 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
56 |
|
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
57 |
#[derive(Debug)] |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
58 |
pub struct ConfigValueParseError { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
59 |
pub origin: ConfigOrigin, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
60 |
pub line: Option<usize>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
61 |
pub section: Vec<u8>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
62 |
pub item: Vec<u8>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
63 |
pub value: Vec<u8>, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
64 |
pub expected_type: &'static str, |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
65 |
} |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
66 |
|
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
67 |
pub fn parse_bool(v: &[u8]) -> Option<bool> { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
68 |
match v.to_ascii_lowercase().as_slice() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
69 |
b"1" | b"yes" | b"true" | b"on" | b"always" => Some(true), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
70 |
b"0" | b"no" | b"false" | b"off" | b"never" => Some(false), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
71 |
_ => None, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
72 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
73 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
74 |
|
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
75 |
pub fn parse_byte_size(value: &[u8]) -> Option<u64> { |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
76 |
let value = str::from_utf8(value).ok()?.to_ascii_lowercase(); |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
77 |
const UNITS: &[(&str, u64)] = &[ |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
78 |
("g", 1 << 30), |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
79 |
("gb", 1 << 30), |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
80 |
("m", 1 << 20), |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
81 |
("mb", 1 << 20), |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
82 |
("k", 1 << 10), |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
83 |
("kb", 1 << 10), |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
84 |
("b", 1 << 0), // Needs to be last |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
85 |
]; |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
86 |
for &(unit, multiplier) in UNITS { |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
87 |
// TODO: use `value.strip_suffix(unit)` when we require Rust 1.45+ |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
88 |
if value.ends_with(unit) { |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
89 |
let value_before_unit = &value[..value.len() - unit.len()]; |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
90 |
let float: f64 = value_before_unit.trim().parse().ok()?; |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
91 |
if float >= 0.0 { |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
92 |
return Some((float * multiplier as f64).round() as u64); |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
93 |
} else { |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
94 |
return None; |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
95 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
96 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
97 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
98 |
value.parse().ok() |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
99 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
100 |
|
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
101 |
impl Config { |
46542
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
102 |
/// Load system and user configuration from various files. |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
103 |
/// |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
104 |
/// This is also affected by some environment variables. |
46556
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46551
diff
changeset
|
105 |
pub fn load( |
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46551
diff
changeset
|
106 |
cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>, |
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46551
diff
changeset
|
107 |
) -> Result<Self, ConfigError> { |
46542
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
108 |
let mut config = Self { layers: Vec::new() }; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
109 |
let opt_rc_path = env::var_os("HGRCPATH"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
110 |
// HGRCPATH replaces system config |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
111 |
if opt_rc_path.is_none() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
112 |
config.add_system_config()? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
113 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
114 |
config.add_for_environment_variable("EDITOR", b"ui", b"editor"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
115 |
config.add_for_environment_variable("VISUAL", b"ui", b"editor"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
116 |
config.add_for_environment_variable("PAGER", b"pager", b"pager"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
117 |
// HGRCPATH replaces user config |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
118 |
if opt_rc_path.is_none() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
119 |
config.add_user_config()? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
120 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
121 |
if let Some(rc_path) = &opt_rc_path { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
122 |
for path in env::split_paths(rc_path) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
123 |
if !path.as_os_str().is_empty() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
124 |
if path.is_dir() { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
125 |
config.add_trusted_dir(&path)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
126 |
} else { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
127 |
config.add_trusted_file(&path)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
128 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
129 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
130 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
131 |
} |
46556
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46551
diff
changeset
|
132 |
if let Some(layer) = ConfigLayer::parse_cli_args(cli_config_args)? { |
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46551
diff
changeset
|
133 |
config.layers.push(layer) |
2e5dd18d6dc3
rhg: Add support for --config CLI arguments
Simon Sapin <simon.sapin@octobus.net>
parents:
46551
diff
changeset
|
134 |
} |
46542
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
135 |
Ok(config) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
136 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
137 |
|
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
138 |
fn add_trusted_dir(&mut self, path: &Path) -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
139 |
if let Some(entries) = std::fs::read_dir(path) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
140 |
.for_file(path) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
141 |
.io_not_found_as_none()? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
142 |
{ |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
143 |
for entry in entries { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
144 |
let file_path = entry.for_file(path)?.path(); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
145 |
if file_path.extension() == Some(std::ffi::OsStr::new("rc")) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
146 |
self.add_trusted_file(&file_path)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
147 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
148 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
149 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
150 |
Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
151 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
152 |
|
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
153 |
fn add_trusted_file(&mut self, path: &Path) -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
154 |
if let Some(data) = |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
155 |
std::fs::read(path).for_file(path).io_not_found_as_none()? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
156 |
{ |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
157 |
self.layers.extend(ConfigLayer::parse(path, &data)?) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
158 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
159 |
Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
160 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
161 |
|
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
162 |
fn add_for_environment_variable( |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
163 |
&mut self, |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
164 |
var: &str, |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
165 |
section: &[u8], |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
166 |
key: &[u8], |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
167 |
) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
168 |
if let Some(value) = env::var_os(var) { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
169 |
let origin = layer::ConfigOrigin::Environment(var.into()); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
170 |
let mut layer = ConfigLayer::new(origin); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
171 |
layer.add( |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
172 |
section.to_owned(), |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
173 |
key.to_owned(), |
46635
d2e61f00ee9d
rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents:
46556
diff
changeset
|
174 |
get_bytes_from_os_str(value), |
46542
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
175 |
None, |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
176 |
); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
177 |
self.layers.push(layer) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
178 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
179 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
180 |
|
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
181 |
#[cfg(unix)] // TODO: other platforms |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
182 |
fn add_system_config(&mut self) -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
183 |
let mut add_for_prefix = |prefix: &Path| -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
184 |
let etc = prefix.join("etc").join("mercurial"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
185 |
self.add_trusted_file(&etc.join("hgrc"))?; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
186 |
self.add_trusted_dir(&etc.join("hgrc.d")) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
187 |
}; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
188 |
let root = Path::new("/"); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
189 |
// 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:
46540
diff
changeset
|
190 |
// instead? TODO: can this be a relative path? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
191 |
let hg = crate::utils::current_exe()?; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
192 |
// TODO: this order (per-installation then per-system) matches |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
193 |
// `systemrcpath()` in `mercurial/scmposix.py`, but |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
194 |
// `mercurial/helptext/config.txt` suggests it should be reversed |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
195 |
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:
46540
diff
changeset
|
196 |
if installation_prefix != root { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
197 |
add_for_prefix(&installation_prefix)? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
198 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
199 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
200 |
add_for_prefix(root)?; |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
201 |
Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
202 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
203 |
|
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
204 |
#[cfg(unix)] // TODO: other plateforms |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
205 |
fn add_user_config(&mut self) -> Result<(), ConfigError> { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
206 |
let opt_home = home::home_dir(); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
207 |
if let Some(home) = &opt_home { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
208 |
self.add_trusted_file(&home.join(".hgrc"))? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
209 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
210 |
let darwin = cfg!(any(target_os = "macos", target_os = "ios")); |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
211 |
if !darwin { |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
212 |
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:
46540
diff
changeset
|
213 |
.map(PathBuf::from) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
214 |
.or_else(|| opt_home.map(|home| home.join(".config"))) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
215 |
{ |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
216 |
self.add_trusted_file(&config_home.join("hg").join("hgrc"))? |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
217 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
218 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
219 |
Ok(()) |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
220 |
} |
2845892dd489
rust: Parse system and user configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46540
diff
changeset
|
221 |
|
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
222 |
/// 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
|
223 |
/// as the order of `sources`. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
224 |
pub fn load_from_explicit_sources( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
225 |
sources: Vec<ConfigSource>, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
226 |
) -> Result<Self, ConfigError> { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
227 |
let mut layers = vec![]; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
228 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
229 |
for source in sources.into_iter() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
230 |
match source { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
231 |
ConfigSource::Parsed(c) => layers.push(c), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
232 |
ConfigSource::AbsPath(c) => { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
233 |
// TODO check if it should be trusted |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
234 |
// mercurial/ui.py:427 |
46540
0d734c0ae1cf
rust: replace read_whole_file with std::fs::read
Simon Sapin <simon.sapin@octobus.net>
parents:
46515
diff
changeset
|
235 |
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
|
236 |
Err(_) => continue, // same as the python code |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
237 |
Ok(data) => data, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
238 |
}; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
239 |
layers.extend(ConfigLayer::parse(&c, &data)?) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
240 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
241 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
242 |
} |
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 |
Ok(Config { layers }) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
245 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
246 |
|
46545
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
247 |
/// 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:
46542
diff
changeset
|
248 |
/// with `self`. |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
249 |
pub(crate) fn combine_with_repo( |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
250 |
&self, |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
251 |
repo_config_files: &[PathBuf], |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
252 |
) -> Result<Self, ConfigError> { |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
253 |
let (cli_layers, other_layers) = self |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
254 |
.layers |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
255 |
.iter() |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
256 |
.cloned() |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
257 |
.partition(ConfigLayer::is_from_command_line); |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
258 |
|
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
259 |
let mut repo_config = Self { |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
260 |
layers: other_layers, |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
261 |
}; |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
262 |
for path in repo_config_files { |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
263 |
// TODO: check if this file should be trusted: |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
264 |
// `mercurial/ui.py:427` |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
265 |
repo_config.add_trusted_file(path)?; |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
266 |
} |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
267 |
repo_config.layers.extend(cli_layers); |
d7685105e504
rhg: Parse per-repository configuration
Simon Sapin <simon.sapin@octobus.net>
parents:
46542
diff
changeset
|
268 |
Ok(repo_config) |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
269 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
270 |
|
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
271 |
fn get_parse<'config, T: 'config>( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
272 |
&'config self, |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
273 |
section: &[u8], |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
274 |
item: &[u8], |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
275 |
expected_type: &'static str, |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
276 |
parse: impl Fn(&'config [u8]) -> Option<T>, |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
277 |
) -> Result<Option<T>, ConfigValueParseError> { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
278 |
match self.get_inner(§ion, &item) { |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
279 |
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
|
280 |
Some(b) => Ok(Some(b)), |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
281 |
None => Err(ConfigValueParseError { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
282 |
origin: layer.origin.to_owned(), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
283 |
line: v.line, |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
284 |
value: v.bytes.to_owned(), |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
285 |
section: section.to_owned(), |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
286 |
item: item.to_owned(), |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
287 |
expected_type, |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
288 |
}), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
289 |
}, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
290 |
None => Ok(None), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
291 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
292 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
293 |
|
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
294 |
/// 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:
46635
diff
changeset
|
295 |
/// 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:
46635
diff
changeset
|
296 |
pub fn get_str( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
297 |
&self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
298 |
section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
299 |
item: &[u8], |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
300 |
) -> Result<Option<&str>, ConfigValueParseError> { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
301 |
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:
46636
diff
changeset
|
302 |
str::from_utf8(value).ok() |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
303 |
}) |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
304 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
305 |
|
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
306 |
/// 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:
46635
diff
changeset
|
307 |
/// 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:
46635
diff
changeset
|
308 |
pub fn get_u32( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
309 |
&self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
310 |
section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
311 |
item: &[u8], |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
312 |
) -> Result<Option<u32>, ConfigValueParseError> { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
313 |
self.get_parse(section, item, "valid integer", |value| { |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
314 |
str::from_utf8(value).ok()?.parse().ok() |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
315 |
}) |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
316 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
317 |
|
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
318 |
/// 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:
46635
diff
changeset
|
319 |
/// 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:
46635
diff
changeset
|
320 |
/// 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:
46635
diff
changeset
|
321 |
pub fn get_byte_size( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
322 |
&self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
323 |
section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
324 |
item: &[u8], |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
325 |
) -> Result<Option<u64>, ConfigValueParseError> { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
326 |
self.get_parse(section, item, "byte quantity", parse_byte_size) |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
327 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
328 |
|
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
329 |
/// 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:
46635
diff
changeset
|
330 |
/// 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:
46635
diff
changeset
|
331 |
/// found, or `None`. |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
332 |
pub fn get_option( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
333 |
&self, |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
334 |
section: &[u8], |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
335 |
item: &[u8], |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
336 |
) -> Result<Option<bool>, ConfigValueParseError> { |
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
337 |
self.get_parse(section, item, "boolean", parse_bool) |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
338 |
} |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
339 |
|
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
340 |
/// 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
|
341 |
/// 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
|
342 |
pub fn get_bool( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
343 |
&self, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
344 |
section: &[u8], |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
345 |
item: &[u8], |
46637
bc08c2331f99
rust: Add a `ConfigValueParseError` variant to common errors
Simon Sapin <simon.sapin@octobus.net>
parents:
46636
diff
changeset
|
346 |
) -> Result<bool, ConfigValueParseError> { |
46187
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
347 |
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
|
348 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
349 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
350 |
/// 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
|
351 |
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
|
352 |
self.get_inner(section, item) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
353 |
.map(|(_, value)| value.bytes.as_ref()) |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
354 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
355 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
356 |
/// 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
|
357 |
fn get_inner( |
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], |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
361 |
) -> Option<(&ConfigLayer, &ConfigValue)> { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
362 |
for layer in self.layers.iter().rev() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
363 |
if !layer.trusted { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
364 |
continue; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
365 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
366 |
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
|
367 |
return Some((&layer, v)); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
368 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
369 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
370 |
None |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
371 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
372 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
373 |
/// 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
|
374 |
/// of precedence. |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
375 |
#[cfg(test)] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
376 |
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
|
377 |
let mut res = vec![]; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
378 |
for layer in self.layers.iter().rev() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
379 |
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
|
380 |
res.push(v.bytes.as_ref()); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
381 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
382 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
383 |
res |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
384 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
385 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
386 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
387 |
#[cfg(test)] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
388 |
mod tests { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
389 |
use super::*; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
390 |
use pretty_assertions::assert_eq; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
391 |
use std::fs::File; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
392 |
use std::io::Write; |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
393 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
394 |
#[test] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
395 |
fn test_include_layer_ordering() { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
396 |
let tmpdir = tempfile::tempdir().unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
397 |
let tmpdir_path = tmpdir.path(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
398 |
let mut included_file = |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
399 |
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
|
400 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
401 |
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
|
402 |
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
|
403 |
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
|
404 |
let data = |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
405 |
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:
46635
diff
changeset
|
406 |
[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
|
407 |
config_file.write_all(data).unwrap(); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
408 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
409 |
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
|
410 |
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
|
411 |
.expect("expected valid config"); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
412 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
413 |
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
|
414 |
assert_eq!( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
415 |
value, |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
416 |
&ConfigValue { |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
417 |
bytes: b"value2".to_vec(), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
418 |
line: Some(4) |
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 |
|
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
422 |
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
|
423 |
assert_eq!(value, b"value2",); |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
424 |
assert_eq!( |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
425 |
config.get_all(b"section", b"item"), |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
426 |
[b"value2", b"value1", b"value0"] |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
427 |
); |
46636
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
428 |
|
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
429 |
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:
46635
diff
changeset
|
430 |
assert_eq!( |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
431 |
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:
46635
diff
changeset
|
432 |
Some(1024 + 512) |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
433 |
); |
305d74c262de
rust: Add config parsing support for more value types
Simon Sapin <simon.sapin@octobus.net>
parents:
46635
diff
changeset
|
434 |
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:
46635
diff
changeset
|
435 |
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
|
436 |
} |
95d6f31e88db
hg-core: add basic config module
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
437 |
} |