rust-chg: add struct holding information needed to spawn server process
The Locator will handle the initialization of the connection. It will spawn
server processes as needed.
--- a/rust/chg/src/locator.rs Sun Oct 07 11:32:42 2018 +0900
+++ b/rust/chg/src/locator.rs Sat Oct 06 21:13:59 2018 +0900
@@ -6,13 +6,54 @@
//! Utility for locating command-server process.
use std::env;
+use std::ffi::{OsStr, OsString};
use std::fs::{self, DirBuilder};
use std::io;
+use std::os::unix::ffi::{OsStrExt, OsStringExt};
use std::os::unix::fs::{DirBuilderExt, MetadataExt};
use std::path::{Path, PathBuf};
+use std::process;
+use std::time::Duration;
use super::procutil;
+/// Helper to connect to and spawn a server process.
+#[derive(Clone, Debug)]
+pub struct Locator {
+ hg_command: OsString,
+ current_dir: PathBuf,
+ env_vars: Vec<(OsString, OsString)>,
+ process_id: u32,
+ base_sock_path: PathBuf,
+ timeout: Duration,
+}
+
+impl Locator {
+ /// Creates locator capturing the current process environment.
+ ///
+ /// If no `$CHGSOCKNAME` is specified, the socket directory will be
+ /// created as necessary.
+ pub fn prepare_from_env() -> io::Result<Locator> {
+ Ok(Locator {
+ hg_command: default_hg_command(),
+ current_dir: env::current_dir()?,
+ env_vars: env::vars_os().collect(),
+ process_id: process::id(),
+ base_sock_path: prepare_server_socket_path()?,
+ timeout: default_timeout(),
+ })
+ }
+
+ /// Temporary socket path for this client process.
+ fn temp_sock_path(&self) -> PathBuf {
+ let src = self.base_sock_path.as_os_str().as_bytes();
+ let mut buf = Vec::with_capacity(src.len() + 6);
+ buf.extend_from_slice(src);
+ buf.extend_from_slice(format!(".{}", self.process_id).as_bytes());
+ OsString::from_vec(buf).into()
+ }
+}
+
/// Determines the server socket to connect to.
///
/// If no `$CHGSOCKNAME` is specified, the socket directory will be created
@@ -47,6 +88,17 @@
}
}
+/// Determines the default hg command.
+pub fn default_hg_command() -> OsString {
+ // TODO: maybe allow embedding the path at compile time (or load from hgrc)
+ env::var_os("CHGHG").or(env::var_os("HG")).unwrap_or(OsStr::new("hg").to_owned())
+}
+
+fn default_timeout() -> Duration {
+ let secs = env::var("CHGTIMEOUT").ok().and_then(|s| s.parse().ok()).unwrap_or(60);
+ Duration::from_secs(secs)
+}
+
/// Creates a directory which the other users cannot access to.
///
/// If the directory already exists, tests its permission.