| Alphare |
| hg-reviewers |
This includes the ability to have an extension name/path that contains a comma,
by double-quoting it.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/config/config.rs (27 lines) | |||
| M | rust/rhg/src/main.rs (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| // config.rs | // config.rs | ||||
| // | // | ||||
| // Copyright 2020 | // Copyright 2020 | ||||
| // Valentin Gatien-Baron, | // Valentin Gatien-Baron, | ||||
| // Raphaël Gomès <rgomes@octobus.net> | // Raphaël Gomès <rgomes@octobus.net> | ||||
| // | // | ||||
| // This software may be used and distributed according to the terms of the | // This software may be used and distributed according to the terms of the | ||||
| // GNU General Public License version 2 or any later version. | // GNU General Public License version 2 or any later version. | ||||
| use super::layer; | use super::layer; | ||||
| use super::values; | use super::values; | ||||
| use crate::config::layer::{ | use crate::config::layer::{ | ||||
| ConfigError, ConfigLayer, ConfigOrigin, ConfigValue, | ConfigError, ConfigLayer, ConfigOrigin, ConfigValue, | ||||
| }; | }; | ||||
| use crate::utils::files::get_bytes_from_os_str; | use crate::utils::files::get_bytes_from_os_str; | ||||
| use crate::utils::SliceExt; | |||||
| use format_bytes::{write_bytes, DisplayBytes}; | use format_bytes::{write_bytes, DisplayBytes}; | ||||
| use std::collections::HashSet; | use std::collections::HashSet; | ||||
| use std::env; | use std::env; | ||||
| use std::fmt; | use std::fmt; | ||||
| use std::path::{Path, PathBuf}; | use std::path::{Path, PathBuf}; | ||||
| use std::str; | use std::str; | ||||
| use crate::errors::{HgResultExt, IoResultExt}; | use crate::errors::{HgResultExt, IoResultExt}; | ||||
| pub fn get_bool( | pub fn get_bool( | ||||
| &self, | &self, | ||||
| section: &[u8], | section: &[u8], | ||||
| item: &[u8], | item: &[u8], | ||||
| ) -> Result<bool, ConfigValueParseError> { | ) -> Result<bool, ConfigValueParseError> { | ||||
| Ok(self.get_option(section, item)?.unwrap_or(false)) | Ok(self.get_option(section, item)?.unwrap_or(false)) | ||||
| } | } | ||||
| /// Returns the corresponding list-value in the config if found, or `None`. | |||||
| /// | |||||
| /// This is appropriate for new configuration keys. The value syntax is | |||||
| /// **not** the same as most existing list-valued config, which has Python | |||||
| /// parsing implemented in `parselist()` in | |||||
| /// `mercurial/utils/stringutil.py`. Faithfully porting that parsing | |||||
| /// algorithm to Rust (including behavior that are arguably bugs) | |||||
| /// turned out to be non-trivial and hasn’t been completed as of this | |||||
| /// writing. | |||||
| /// | |||||
| /// Instead, the "simple" syntax is: split on comma, then trim leading and | |||||
| /// trailing whitespace of each component. Quotes or backslashes are not | |||||
| /// interpreted in any way. Commas are mandatory between values. Values | |||||
| /// that contain a comma are not supported. | |||||
| pub fn get_simple_list( | |||||
| &self, | |||||
| section: &[u8], | |||||
| item: &[u8], | |||||
| ) -> Option<impl Iterator<Item = &[u8]>> { | |||||
| self.get(section, item).map(|value| { | |||||
| value | |||||
| .split(|&byte| byte == b',') | |||||
| .map(|component| component.trim()) | |||||
| }) | |||||
| } | |||||
| /// If there is an `item` value in `section`, parse and return a list of | /// If there is an `item` value in `section`, parse and return a list of | ||||
| /// byte strings. | /// byte strings. | ||||
| pub fn get_list( | pub fn get_list( | ||||
| &self, | &self, | ||||
| section: &[u8], | section: &[u8], | ||||
| item: &[u8], | item: &[u8], | ||||
| ) -> Option<Vec<Vec<u8>>> { | ) -> Option<Vec<Vec<u8>>> { | ||||
| self.get(section, item).map(values::parse_list) | self.get(section, item).map(values::parse_list) | ||||
| fn check_extensions(config: &Config) -> Result<(), CommandError> { | fn check_extensions(config: &Config) -> Result<(), CommandError> { | ||||
| let enabled = config.get_section_keys(b"extensions"); | let enabled = config.get_section_keys(b"extensions"); | ||||
| let mut unsupported = enabled; | let mut unsupported = enabled; | ||||
| for supported in SUPPORTED_EXTENSIONS { | for supported in SUPPORTED_EXTENSIONS { | ||||
| unsupported.remove(supported); | unsupported.remove(supported); | ||||
| } | } | ||||
| if let Some(ignored_list) = | if let Some(ignored_list) = config.get_list(b"rhg", b"ignored-extensions") | ||||
| config.get_simple_list(b"rhg", b"ignored-extensions") | |||||
| { | { | ||||
| for ignored in ignored_list { | for ignored in ignored_list { | ||||
| unsupported.remove(ignored); | unsupported.remove(ignored.as_slice()); | ||||
| } | } | ||||
| } | } | ||||
| if unsupported.is_empty() { | if unsupported.is_empty() { | ||||
| Ok(()) | Ok(()) | ||||
| } else { | } else { | ||||
| Err(CommandError::UnsupportedFeature { | Err(CommandError::UnsupportedFeature { | ||||
| message: format_bytes!( | message: format_bytes!( | ||||
| b"extensions: {} (consider adding them to 'rhg.ignored-extensions' config)", | b"extensions: {} (consider adding them to 'rhg.ignored-extensions' config)", | ||||
| join(unsupported, b", ") | join(unsupported, b", ") | ||||
| ), | ), | ||||
| }) | }) | ||||
| } | } | ||||
| } | } | ||||