This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8379

rust-chg: add interface to run "validate" request
ClosedPublic

Authored by yuja on Apr 6 2020, 10:19 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG43513444bb88: rust-chg: add interface to run "validate" request

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

yuja created this revision.Apr 6 2020, 10:19 AM
Alphare accepted this revision.Apr 8 2020, 4:09 AM
yuja added a commit: rHG43513444bb88: rust-chg: add interface to run "validate" request.Apr 9 2020, 3:25 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG43513444bb88: rust-chg: add interface to run "validate" request (authored by yuja). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/chg/src/clientext.rs (32 lines)

Diff 21017

rust/chg/src/clientext.rs

// Copyright 2018 Yuya Nishihara <yuya@tcha.org> // Copyright 2018 Yuya Nishihara <yuya@tcha.org>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
//! cHg extensions to command server client. //! cHg extensions to command server client.
use bytes::Bytes;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::io;
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::path::Path; use std::path::Path;
use tokio_hglib::protocol::OneShotRequest; use tokio_hglib::protocol::{OneShotQuery, OneShotRequest};
use tokio_hglib::{Client, Connection}; use tokio_hglib::{Client, Connection};
use super::attachio::AttachIo; use super::attachio::AttachIo;
use super::message; use super::message::{self, Instruction};
use super::runcommand::ChgRunCommand; use super::runcommand::ChgRunCommand;
use super::uihandler::SystemHandler; use super::uihandler::SystemHandler;
pub trait ChgClientExt<C> pub trait ChgClientExt<C>
where where
C: Connection + AsRawFd, C: Connection + AsRawFd,
{ {
/// Attaches the client file descriptors to the server. /// Attaches the client file descriptors to the server.
P: AsRef<OsStr>; P: AsRef<OsStr>;
/// Runs the specified Mercurial command with cHg extension. /// Runs the specified Mercurial command with cHg extension.
fn run_command_chg<I, P, H>(self, handler: H, args: I) -> ChgRunCommand<C, H> fn run_command_chg<I, P, H>(self, handler: H, args: I) -> ChgRunCommand<C, H>
where where
I: IntoIterator<Item = P>, I: IntoIterator<Item = P>,
P: AsRef<OsStr>, P: AsRef<OsStr>,
H: SystemHandler; H: SystemHandler;
/// Validates if the server can run Mercurial commands with the expected
/// configuration.
///
/// The `args` should contain early command arguments such as `--config`
/// and `-R`.
///
/// Client-side environment must be sent prior to this request, by
/// `set_current_dir()` and `set_env_vars_os()`.
fn validate<I, P>(self, args: I) -> OneShotQuery<C, fn(Bytes) -> io::Result<Vec<Instruction>>>
where
I: IntoIterator<Item = P>,
P: AsRef<OsStr>;
} }
impl<C> ChgClientExt<C> for Client<C> impl<C> ChgClientExt<C> for Client<C>
where where
C: Connection + AsRawFd, C: Connection + AsRawFd,
{ {
fn attach_io<I, O, E>(self, stdin: I, stdout: O, stderr: E) -> AttachIo<C, I, O, E> fn attach_io<I, O, E>(self, stdin: I, stdout: O, stderr: E) -> AttachIo<C, I, O, E>
where where
fn run_command_chg<I, P, H>(self, handler: H, args: I) -> ChgRunCommand<C, H> fn run_command_chg<I, P, H>(self, handler: H, args: I) -> ChgRunCommand<C, H>
where where
I: IntoIterator<Item = P>, I: IntoIterator<Item = P>,
P: AsRef<OsStr>, P: AsRef<OsStr>,
H: SystemHandler, H: SystemHandler,
{ {
ChgRunCommand::with_client(self, handler, message::pack_args_os(args)) ChgRunCommand::with_client(self, handler, message::pack_args_os(args))
} }
fn validate<I, P>(self, args: I) -> OneShotQuery<C, fn(Bytes) -> io::Result<Vec<Instruction>>>
where
I: IntoIterator<Item = P>,
P: AsRef<OsStr>,
{
OneShotQuery::start_with_args(
self,
b"validate",
message::pack_args_os(args),
message::parse_instructions,
)
}
} }