| Alphare |
| hg-reviewers |
This refactoring makes it easy to patch some command-line preprocessing into rhg.
We use this to support using rhg as a shebang interpreter, for example.
| No Linters Available |
| No Unit Test Coverage |
| rust/rhg/src/main.rs | ||
|---|---|---|
| 390 | Changed it now. | |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/rhg/src/blackbox.rs (21 lines) | |||
| M | rust/rhg/src/main.rs (30 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| b6eb3665e2c1 | d8a38186a092 | Arseniy Alekseyev | Tue, Apr 12, 3:01 PM |
| //! Logging for repository events, including commands run in the repository. | //! Logging for repository events, including commands run in the repository. | ||||
| use crate::CliInvocation; | use crate::CliInvocation; | ||||
| use format_bytes::format_bytes; | use format_bytes::format_bytes; | ||||
| use hg::errors::HgError; | use hg::errors::HgError; | ||||
| use hg::repo::Repo; | use hg::repo::Repo; | ||||
| use hg::utils::{files::get_bytes_from_os_str, shell_quote}; | use hg::utils::{files::get_bytes_from_os_str, shell_quote}; | ||||
| use std::ffi::OsString; | |||||
| const ONE_MEBIBYTE: u64 = 1 << 20; | const ONE_MEBIBYTE: u64 = 1 << 20; | ||||
| // TODO: somehow keep defaults in sync with `configitem` in `hgext/blackbox.py` | // TODO: somehow keep defaults in sync with `configitem` in `hgext/blackbox.py` | ||||
| const DEFAULT_MAX_SIZE: u64 = ONE_MEBIBYTE; | const DEFAULT_MAX_SIZE: u64 = ONE_MEBIBYTE; | ||||
| const DEFAULT_MAX_FILES: u32 = 7; | const DEFAULT_MAX_FILES: u32 = 7; | ||||
| // Python does not support %.3f, only %f | // Python does not support %.3f, only %f | ||||
| None | None | ||||
| }; | }; | ||||
| Ok(Self { | Ok(Self { | ||||
| process_start_time, | process_start_time, | ||||
| configured, | configured, | ||||
| }) | }) | ||||
| } | } | ||||
| pub fn log_command_start(&self) { | pub fn log_command_start<'arg>( | ||||
| &self, | |||||
| argv: impl Iterator<Item = &'arg OsString>, | |||||
| ) { | |||||
| if let Some(configured) = &self.configured { | if let Some(configured) = &self.configured { | ||||
| let message = format_bytes!(b"(rust) {}", format_cli_args()); | let message = format_bytes!(b"(rust) {}", format_cli_args(argv)); | ||||
| configured.log(&self.process_start_time.calendar_based, &message); | configured.log(&self.process_start_time.calendar_based, &message); | ||||
| } | } | ||||
| } | } | ||||
| pub fn log_command_end(&self, exit_code: i32) { | pub fn log_command_end<'arg>( | ||||
| &self, | |||||
| argv: impl Iterator<Item = &'arg OsString>, | |||||
| exit_code: i32, | |||||
| ) { | |||||
| if let Some(configured) = &self.configured { | if let Some(configured) = &self.configured { | ||||
| let now = chrono::Local::now(); | let now = chrono::Local::now(); | ||||
| let duration = self | let duration = self | ||||
| .process_start_time | .process_start_time | ||||
| .monotonic_clock | .monotonic_clock | ||||
| .elapsed() | .elapsed() | ||||
| .as_secs_f64(); | .as_secs_f64(); | ||||
| let message = format_bytes!( | let message = format_bytes!( | ||||
| b"(rust) {} exited {} after {} seconds", | b"(rust) {} exited {} after {} seconds", | ||||
| format_cli_args(), | format_cli_args(argv), | ||||
| exit_code, | exit_code, | ||||
| format_bytes::Utf8(format_args!("{:.03}", duration)) | format_bytes::Utf8(format_args!("{:.03}", duration)) | ||||
| ); | ); | ||||
| configured.log(&now, &message); | configured.log(&now, &message); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| Ok(()) => {} | Ok(()) => {} | ||||
| Err(_io_error) => { | Err(_io_error) => { | ||||
| // TODO: log a non-fatal warning to stderr | // TODO: log a non-fatal warning to stderr | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| fn format_cli_args() -> Vec<u8> { | fn format_cli_args<'a>( | ||||
| let mut args = std::env::args_os(); | mut args: impl Iterator<Item = &'a OsString>, | ||||
| ) -> Vec<u8> { | |||||
| let _ = args.next(); // Skip the first (or zeroth) arg, the name of the `rhg` executable | let _ = args.next(); // Skip the first (or zeroth) arg, the name of the `rhg` executable | ||||
| let mut args = args.map(|arg| shell_quote(&get_bytes_from_os_str(arg))); | let mut args = args.map(|arg| shell_quote(&get_bytes_from_os_str(arg))); | ||||
| let mut formatted = Vec::new(); | let mut formatted = Vec::new(); | ||||
| if let Some(arg) = args.next() { | if let Some(arg) = args.next() { | ||||
| formatted.extend(arg) | formatted.extend(arg) | ||||
| } | } | ||||
| for arg in args { | for arg in args { | ||||
| formatted.push(b' '); | formatted.push(b' '); | ||||
| formatted.extend(arg) | formatted.extend(arg) | ||||
| } | } | ||||
| formatted | formatted | ||||
| } | } | ||||
Nitpicking: why is this "b? This implies some other 'a lifetime by convention.