##// END OF EJS Templates
phabricator: use .arcconfig for the callsign if not set locally (issue6243)...
phabricator: use .arcconfig for the callsign if not set locally (issue6243) This makes things easier for people working with more than one repository because this file can be committed to each repository. The bug report asks to read <repo>/.arcrc, but AFAICT, that file lives in ~/ and holds the credentials. And we already track an .arcconfig file. Any callsign set globally is still used if that is all that is present, but .arcconfig will override it if available. The idea behind letting the local hgrc override .arcconfig is that the developer may need to do testing against another server, and not dirty the working directory. Originally I was going to just try to read the callsign in `getrepophid()` if it wasn't present in the hg config. That works fine, but I think it also makes sense to read the URL from this file too. That would have worked less well because `readurltoken()` doesn't have access to the repo object to know where to find the file. Supplimenting the config mechanism is less magical because it reports the source and value of the properties used, and it doesn't need to read the file twice. Invalid hgrc files generally cause the program to abort. I only flagged it as a warning here because it's not our config file, not crucial to the whole program operating, and really shouldn't be corrupt in the typical case where it is checked into the repo. Differential Revision: https://phab.mercurial-scm.org/D7934

File last commit:

r44270:ce088b38 default
r44586:59b3fe1e default
Show More
runcommand.rs
171 lines | 5.8 KiB | application/rls-services+xml | RustLexer
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 // Copyright 2018 Yuya Nishihara <yuya@tcha.org>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//! Functions to run Mercurial command in cHg-aware command server.
use bytes::Bytes;
use futures::future::IntoFuture;
use futures::{Async, Future, Poll};
use std::io;
use std::mem;
use std::os::unix::io::AsRawFd;
use tokio_hglib::codec::ChannelMessage;
use tokio_hglib::protocol::MessageLoop;
Gregory Szorc
rust: run rustfmt...
r44270 use tokio_hglib::{Client, Connection};
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011
use super::attachio::AttachIo;
use super::message::{self, CommandType};
use super::uihandler::SystemHandler;
enum AsyncS<R, S> {
Ready(R),
NotReady(S),
PollAgain(S),
}
enum CommandState<C, H>
Gregory Szorc
rust: run rustfmt...
r44270 where
C: Connection,
H: SystemHandler,
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 {
Running(MessageLoop<C>, H),
SpawningPager(Client<C>, <H::SpawnPagerResult as IntoFuture>::Future),
AttachingPager(AttachIo<C, io::Stdin, H::PagerStdin, H::PagerStdin>, H),
WaitingSystem(Client<C>, <H::RunSystemResult as IntoFuture>::Future),
Finished,
}
type CommandPoll<C, H> = io::Result<(AsyncS<(Client<C>, H, i32), CommandState<C, H>>)>;
/// Future resolves to `(exit_code, client)`.
#[must_use = "futures do nothing unless polled"]
pub struct ChgRunCommand<C, H>
Gregory Szorc
rust: run rustfmt...
r44270 where
C: Connection,
H: SystemHandler,
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 {
state: CommandState<C, H>,
}
impl<C, H> ChgRunCommand<C, H>
Gregory Szorc
rust: run rustfmt...
r44270 where
C: Connection + AsRawFd,
H: SystemHandler,
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 {
Gregory Szorc
rust: run rustfmt...
r44270 pub fn with_client(client: Client<C>, handler: H, packed_args: Bytes) -> ChgRunCommand<C, H> {
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 let msg_loop = MessageLoop::start_with_args(client, b"runcommand", packed_args);
ChgRunCommand {
state: CommandState::Running(msg_loop, handler),
}
}
}
impl<C, H> Future for ChgRunCommand<C, H>
Gregory Szorc
rust: run rustfmt...
r44270 where
C: Connection + AsRawFd,
H: SystemHandler,
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 {
type Item = (Client<C>, H, i32);
type Error = io::Error;
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
loop {
let state = mem::replace(&mut self.state, CommandState::Finished);
match state.poll()? {
AsyncS::Ready((client, handler, code)) => {
return Ok(Async::Ready((client, handler, code)));
}
AsyncS::NotReady(newstate) => {
self.state = newstate;
return Ok(Async::NotReady);
}
AsyncS::PollAgain(newstate) => {
self.state = newstate;
}
}
}
}
}
impl<C, H> CommandState<C, H>
Gregory Szorc
rust: run rustfmt...
r44270 where
C: Connection + AsRawFd,
H: SystemHandler,
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 {
fn poll(self) -> CommandPoll<C, H> {
match self {
CommandState::Running(mut msg_loop, handler) => {
if let Async::Ready((client, msg)) = msg_loop.poll()? {
process_message(client, handler, msg)
} else {
Ok(AsyncS::NotReady(CommandState::Running(msg_loop, handler)))
}
}
CommandState::SpawningPager(client, mut fut) => {
if let Async::Ready((handler, pin)) = fut.poll()? {
let fut = AttachIo::with_client(client, io::stdin(), pin, None);
Gregory Szorc
rust: run rustfmt...
r44270 Ok(AsyncS::PollAgain(CommandState::AttachingPager(
fut, handler,
)))
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 } else {
Ok(AsyncS::NotReady(CommandState::SpawningPager(client, fut)))
}
}
CommandState::AttachingPager(mut fut, handler) => {
if let Async::Ready(client) = fut.poll()? {
Gregory Szorc
rust: run rustfmt...
r44270 let msg_loop = MessageLoop::start(client, b""); // terminator
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 Ok(AsyncS::PollAgain(CommandState::Running(msg_loop, handler)))
} else {
Ok(AsyncS::NotReady(CommandState::AttachingPager(fut, handler)))
}
}
CommandState::WaitingSystem(client, mut fut) => {
if let Async::Ready((handler, code)) = fut.poll()? {
let data = message::pack_result_code(code);
let msg_loop = MessageLoop::resume_with_data(client, data);
Ok(AsyncS::PollAgain(CommandState::Running(msg_loop, handler)))
} else {
Ok(AsyncS::NotReady(CommandState::WaitingSystem(client, fut)))
}
}
Gregory Szorc
rust: run rustfmt...
r44270 CommandState::Finished => panic!("poll ChgRunCommand after it's done"),
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 }
}
}
fn process_message<C, H>(client: Client<C>, handler: H, msg: ChannelMessage) -> CommandPoll<C, H>
Gregory Szorc
rust: run rustfmt...
r44270 where
C: Connection,
H: SystemHandler,
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 {
match msg {
ChannelMessage::Data(b'r', data) => {
let code = message::parse_result_code(data)?;
Ok(AsyncS::Ready((client, handler, code)))
}
ChannelMessage::Data(..) => {
// just ignores data sent to optional channel
let msg_loop = MessageLoop::resume(client);
Ok(AsyncS::PollAgain(CommandState::Running(msg_loop, handler)))
}
Gregory Szorc
rust: run rustfmt...
r44270 ChannelMessage::InputRequest(..) | ChannelMessage::LineRequest(..) => Err(io::Error::new(
io::ErrorKind::InvalidData,
"unsupported request",
)),
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 ChannelMessage::SystemRequest(data) => {
let (cmd_type, cmd_spec) = message::parse_command_spec(data)?;
match cmd_type {
CommandType::Pager => {
let fut = handler.spawn_pager(cmd_spec).into_future();
Ok(AsyncS::PollAgain(CommandState::SpawningPager(client, fut)))
}
CommandType::System => {
let fut = handler.run_system(cmd_spec).into_future();
Ok(AsyncS::PollAgain(CommandState::WaitingSystem(client, fut)))
}
}
}
}
}