##// END OF EJS Templates
rhg: Propagate config errors in `rhg status`...
Simon Sapin -
r49160:3bd62274 default
parent child Browse files
Show More
@@ -138,12 +138,12 b' pub fn run(invocation: &crate::CliInvoca'
138 }
138 }
139
139
140 // TODO: lift these limitations
140 // TODO: lift these limitations
141 if invocation.config.get_bool(b"ui", b"tweakdefaults").ok() == Some(true) {
141 if invocation.config.get_bool(b"ui", b"tweakdefaults")? {
142 return Err(CommandError::unsupported(
142 return Err(CommandError::unsupported(
143 "ui.tweakdefaults is not yet supported with rhg status",
143 "ui.tweakdefaults is not yet supported with rhg status",
144 ));
144 ));
145 }
145 }
146 if invocation.config.get_bool(b"ui", b"statuscopies").ok() == Some(true) {
146 if invocation.config.get_bool(b"ui", b"statuscopies")? {
147 return Err(CommandError::unsupported(
147 return Err(CommandError::unsupported(
148 "ui.statuscopies is not yet supported with rhg status",
148 "ui.statuscopies is not yet supported with rhg status",
149 ));
149 ));
@@ -263,10 +263,9 b' fn display_status_paths('
263 status_prefix: &[u8],
263 status_prefix: &[u8],
264 ) -> Result<(), CommandError> {
264 ) -> Result<(), CommandError> {
265 paths.sort_unstable();
265 paths.sort_unstable();
266 let mut relative: bool =
266 let mut relative: bool = config.get_bool(b"ui", b"relative-paths")?;
267 config.get_bool(b"ui", b"relative-paths").unwrap_or(false);
268 relative = config
267 relative = config
269 .get_bool(b"commands", b"status.relative")
268 .get_option(b"commands", b"status.relative")?
270 .unwrap_or(relative);
269 .unwrap_or(relative);
271 if relative && !ui.plain() {
270 if relative && !ui.plain() {
272 relativize_paths(
271 relativize_paths(
General Comments 0
You need to be logged in to leave comments. Login now