# HG changeset patch # User Yuya Nishihara # Date 1537783074 -32400 # Node ID 74da9d999cd766ce4c04174ddc9b398658c7446b # Parent 44840bcc411ab5d0466d63cbbacb366b837d3950 rust-chg: add Client extensions to run cHg-specific requests This just provides a nicer way to issue command-server requests. diff -r 44840bcc411a -r 74da9d999cd7 rust/chg/src/clientext.rs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rust/chg/src/clientext.rs Mon Sep 24 18:57:54 2018 +0900 @@ -0,0 +1,51 @@ +// Copyright 2018 Yuya Nishihara +// +// This software may be used and distributed according to the terms of the +// GNU General Public License version 2 or any later version. + +//! cHg extensions to command server client. + +use std::ffi::OsStr; +use std::os::unix::io::AsRawFd; +use tokio_hglib::{Client, Connection}; + +use super::attachio::AttachIo; +use super::message; +use super::runcommand::ChgRunCommand; +use super::uihandler::SystemHandler; + +pub trait ChgClientExt + where C: Connection + AsRawFd, +{ + /// Attaches the client file descriptors to the server. + fn attach_io(self, stdin: I, stdout: O, stderr: E) -> AttachIo + where I: AsRawFd, + O: AsRawFd, + E: AsRawFd; + + /// Runs the specified Mercurial command with cHg extension. + fn run_command_chg(self, handler: H, args: I) -> ChgRunCommand + where I: IntoIterator, + P: AsRef, + H: SystemHandler; +} + +impl ChgClientExt for Client + where C: Connection + AsRawFd, +{ + fn attach_io(self, stdin: I, stdout: O, stderr: E) -> AttachIo + where I: AsRawFd, + O: AsRawFd, + E: AsRawFd, + { + AttachIo::with_client(self, stdin, stdout, Some(stderr)) + } + + fn run_command_chg(self, handler: H, args: I) -> ChgRunCommand + where I: IntoIterator, + P: AsRef, + H: SystemHandler, + { + ChgRunCommand::with_client(self, handler, message::pack_args_os(args)) + } +} diff -r 44840bcc411a -r 74da9d999cd7 rust/chg/src/lib.rs --- a/rust/chg/src/lib.rs Mon Sep 24 18:33:46 2018 +0900 +++ b/rust/chg/src/lib.rs Mon Sep 24 18:57:54 2018 +0900 @@ -11,11 +11,13 @@ extern crate tokio_hglib; extern crate tokio_process; -pub mod attachio; +mod attachio; +mod clientext; pub mod locator; pub mod message; pub mod procutil; -pub mod runcommand; +mod runcommand; mod uihandler; +pub use clientext::ChgClientExt; pub use uihandler::{ChgUiHandler, SystemHandler};