changeset 44672:7bf45ed9e25e

rust-chg: abort if server doesn't have required capabilities It's checked at Locator::connect() since we'll have to do more stuff in this function. Differential Revision: https://phab.mercurial-scm.org/D8361
author Yuya Nishihara <yuya@tcha.org>
date Sun, 07 Oct 2018 10:12:22 +0900
parents bb936e25a84a
children 0a2516efc463
files rust/chg/src/locator.rs
diffstat 1 files changed, 29 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rust/chg/src/locator.rs	Sat Oct 06 20:10:44 2018 +0900
+++ b/rust/chg/src/locator.rs	Sun Oct 07 10:12:22 2018 +0900
@@ -20,8 +20,11 @@
 use tokio_process::{Child, CommandExt};
 use tokio_timer;
 
+use super::message::ServerSpec;
 use super::procutil;
 
+const REQUIRED_SERVER_CAPABILITIES: &[&str] = &["attachio", "chdir", "runcommand"];
+
 /// Helper to connect to and spawn a server process.
 #[derive(Clone, Debug)]
 pub struct Locator {
@@ -68,10 +71,15 @@
     /// Tries to connect to the existing server, or spawns new if not running.
     fn try_connect(self) -> impl Future<Item = (Self, UnixClient), Error = io::Error> {
         debug!("try connect to {}", self.base_sock_path.display());
-        UnixClient::connect(self.base_sock_path.clone()).then(|res| match res {
-            Ok(client) => Either::A(future::ok((self, client))),
-            Err(_) => Either::B(self.spawn_connect()),
-        })
+        UnixClient::connect(self.base_sock_path.clone())
+            .then(|res| match res {
+                Ok(client) => Either::A(future::ok((self, client))),
+                Err(_) => Either::B(self.spawn_connect()),
+            })
+            .and_then(|(loc, client)| {
+                check_server_capabilities(client.server_spec())?;
+                Ok((loc, client))
+            })
     }
 
     /// Spawns new server process and connects to it.
@@ -239,3 +247,20 @@
         Err(io::Error::new(io::ErrorKind::Other, "insecure directory"))
     }
 }
+
+fn check_server_capabilities(spec: &ServerSpec) -> io::Result<()> {
+    let unsupported: Vec<_> = REQUIRED_SERVER_CAPABILITIES
+        .iter()
+        .cloned()
+        .filter(|&s| !spec.capabilities.contains(s))
+        .collect();
+    if unsupported.is_empty() {
+        Ok(())
+    } else {
+        let msg = format!(
+            "insufficient server capabilities: {}",
+            unsupported.join(", ")
+        );
+        Err(io::Error::new(io::ErrorKind::Other, msg))
+    }
+}