diff --git a/rust/chg/src/clientext.rs b/rust/chg/src/clientext.rs --- a/rust/chg/src/clientext.rs +++ b/rust/chg/src/clientext.rs @@ -33,6 +33,12 @@ where P: AsRef; + /// Updates the environment variables of the server. + fn set_env_vars_os(self, vars: I) -> OneShotRequest + where + I: IntoIterator, + P: AsRef; + /// Runs the specified Mercurial command with cHg extension. fn run_command_chg(self, handler: H, args: I) -> ChgRunCommand where @@ -61,6 +67,14 @@ OneShotRequest::start_with_args(self, b"chdir", dir.as_ref().as_os_str().as_bytes()) } + fn set_env_vars_os(self, vars: I) -> OneShotRequest + where + I: IntoIterator, + P: AsRef, + { + OneShotRequest::start_with_args(self, b"setenv", message::pack_env_vars_os(vars)) + } + fn run_command_chg(self, handler: H, args: I) -> ChgRunCommand where I: IntoIterator, diff --git a/rust/chg/src/locator.rs b/rust/chg/src/locator.rs --- a/rust/chg/src/locator.rs +++ b/rust/chg/src/locator.rs @@ -24,7 +24,7 @@ use super::message::ServerSpec; use super::procutil; -const REQUIRED_SERVER_CAPABILITIES: &[&str] = &["attachio", "chdir", "runcommand"]; +const REQUIRED_SERVER_CAPABILITIES: &[&str] = &["attachio", "chdir", "runcommand", "setenv"]; /// Helper to connect to and spawn a server process. #[derive(Clone, Debug)] @@ -86,6 +86,11 @@ .set_current_dir(&loc.current_dir) .map(|client| (loc, client)) }) + .and_then(|(loc, client)| { + client + .set_env_vars_os(loc.env_vars.iter().cloned()) + .map(|client| (loc, client)) + }) } /// Spawns new server process and connects to it.