rust-chg: move set_current_dir() to Locator
This is necessary to run config validation in proper environment.
Differential Revision: https://phab.mercurial-scm.org/D8362
--- a/rust/chg/src/locator.rs Sun Oct 07 10:12:22 2018 +0900
+++ b/rust/chg/src/locator.rs Sun Oct 07 10:23:57 2018 +0900
@@ -20,6 +20,7 @@
use tokio_process::{Child, CommandExt};
use tokio_timer;
+use super::clientext::ChgClientExt;
use super::message::ServerSpec;
use super::procutil;
@@ -80,6 +81,11 @@
check_server_capabilities(client.server_spec())?;
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.
--- a/rust/chg/src/main.rs Sun Oct 07 10:12:22 2018 +0900
+++ b/rust/chg/src/main.rs Sun Oct 07 10:23:57 2018 +0900
@@ -73,14 +73,12 @@
}
fn run() -> io::Result<i32> {
- let current_dir = env::current_dir()?;
let loc = Locator::prepare_from_env()?;
let handler = ChgUiHandler::new();
let (result_tx, result_rx) = oneshot::channel();
let fut = loc
.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| {
let pid = client.server_spec().process_id.unwrap();
let pgid = client.server_spec().process_group_id;