| Alphare |
| hg-reviewers |
This is necessary to run config validation in proper environment.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/chg/src/locator.rs (6 lines) | |||
| M | rust/chg/src/main.rs (4 lines) |
| use std::path::{Path, PathBuf}; | use std::path::{Path, PathBuf}; | ||||
| use std::process::{self, Command}; | use std::process::{self, Command}; | ||||
| use std::time::Duration; | use std::time::Duration; | ||||
| use tokio::prelude::*; | use tokio::prelude::*; | ||||
| use tokio_hglib::UnixClient; | use tokio_hglib::UnixClient; | ||||
| use tokio_process::{Child, CommandExt}; | use tokio_process::{Child, CommandExt}; | ||||
| use tokio_timer; | use tokio_timer; | ||||
| use super::clientext::ChgClientExt; | |||||
| use super::message::ServerSpec; | use super::message::ServerSpec; | ||||
| use super::procutil; | use super::procutil; | ||||
| const REQUIRED_SERVER_CAPABILITIES: &[&str] = &["attachio", "chdir", "runcommand"]; | const REQUIRED_SERVER_CAPABILITIES: &[&str] = &["attachio", "chdir", "runcommand"]; | ||||
| /// Helper to connect to and spawn a server process. | /// Helper to connect to and spawn a server process. | ||||
| #[derive(Clone, Debug)] | #[derive(Clone, Debug)] | ||||
| pub struct Locator { | pub struct Locator { | ||||
| .then(|res| match res { | .then(|res| match res { | ||||
| Ok(client) => Either::A(future::ok((self, client))), | Ok(client) => Either::A(future::ok((self, client))), | ||||
| Err(_) => Either::B(self.spawn_connect()), | Err(_) => Either::B(self.spawn_connect()), | ||||
| }) | }) | ||||
| .and_then(|(loc, client)| { | .and_then(|(loc, client)| { | ||||
| check_server_capabilities(client.server_spec())?; | check_server_capabilities(client.server_spec())?; | ||||
| Ok((loc, client)) | Ok((loc, client)) | ||||
| }) | }) | ||||
| .and_then(|(loc, client)| { | |||||
| client | |||||
| .set_current_dir(&loc.current_dir) | |||||
| .map(|client| (loc, client)) | |||||
| }) | |||||
| } | } | ||||
| /// Spawns new server process and connects to it. | /// Spawns new server process and connects to it. | ||||
| /// | /// | ||||
| /// The server will be spawned at the current working directory, then | /// The server will be spawned at the current working directory, then | ||||
| /// chdir to "/", so that the server will load configs from the target | /// chdir to "/", so that the server will load configs from the target | ||||
| /// repository. | /// repository. | ||||
| fn spawn_connect(self) -> impl Future<Item = (Self, UnixClient), Error = io::Error> { | fn spawn_connect(self) -> impl Future<Item = (Self, UnixClient), Error = io::Error> { | ||||
| let code = run().unwrap_or_else(|err| { | let code = run().unwrap_or_else(|err| { | ||||
| writeln!(io::stderr(), "chg: abort: {}", err).unwrap_or(()); | writeln!(io::stderr(), "chg: abort: {}", err).unwrap_or(()); | ||||
| 255 | 255 | ||||
| }); | }); | ||||
| process::exit(code); | process::exit(code); | ||||
| } | } | ||||
| fn run() -> io::Result<i32> { | fn run() -> io::Result<i32> { | ||||
| let current_dir = env::current_dir()?; | |||||
| let loc = Locator::prepare_from_env()?; | let loc = Locator::prepare_from_env()?; | ||||
| let handler = ChgUiHandler::new(); | let handler = ChgUiHandler::new(); | ||||
| let (result_tx, result_rx) = oneshot::channel(); | let (result_tx, result_rx) = oneshot::channel(); | ||||
| let fut = loc | let fut = loc | ||||
| .connect() | .connect() | ||||
| .and_then(|(_, client)| client.set_current_dir(current_dir)) | .and_then(|(_, client)| client.attach_io(io::stdin(), io::stdout(), io::stderr())) | ||||
| .and_then(|client| client.attach_io(io::stdin(), io::stdout(), io::stderr())) | |||||
| .and_then(|client| { | .and_then(|client| { | ||||
| let pid = client.server_spec().process_id.unwrap(); | let pid = client.server_spec().process_id.unwrap(); | ||||
| let pgid = client.server_spec().process_group_id; | let pgid = client.server_spec().process_group_id; | ||||
| procutil::setup_signal_handler_once(pid, pgid)?; | procutil::setup_signal_handler_once(pid, pgid)?; | ||||
| Ok(client) | Ok(client) | ||||
| }) | }) | ||||
| .and_then(|client| client.run_command_chg(handler, env::args_os().skip(1))) | .and_then(|client| client.run_command_chg(handler, env::args_os().skip(1))) | ||||
| .map(|(_client, _handler, code)| { | .map(|(_client, _handler, code)| { | ||||