##// END OF EJS Templates
diff: replace --merge option by config option...
diff: replace --merge option by config option I can't think of any reason you'd want to enable the merge diff on a run-to-run basis; you'd probably either always or never want it set (though I can't see why you'd never want it set). If you have it set, you'll probably also want the same output in `hg log -p` output. Having a single config option for the feature makes sense. Differential Revision: https://phab.mercurial-scm.org/D9956

File last commit:

r46195:426294d0 default
r47246:d57e607d default
Show More
runcommand.rs
66 lines | 2.4 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 std::io;
use std::os::unix::io::AsRawFd;
use tokio_hglib::codec::ChannelMessage;
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 use tokio_hglib::{Connection, Protocol};
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 use crate::attachio;
Yuya Nishihara
rust-chg: use "crate::" to import local modules...
r45180 use crate::message::{self, CommandType};
use crate::uihandler::SystemHandler;
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 /// Runs the given Mercurial command in cHg-aware command server, and
/// fetches the result code.
///
/// This is a subset of tokio-hglib's `run_command()` with the additional
/// SystemRequest support.
pub async fn run_command(
proto: &mut Protocol<impl Connection + AsRawFd>,
handler: &mut impl SystemHandler,
packed_args: impl Into<Bytes>,
) -> io::Result<i32> {
proto
.send_command_with_args("runcommand", packed_args)
.await?;
loop {
match proto.fetch_response().await? {
Yuya Nishihara
rust-chg: indent process_message() to prepare mass rewrite to futures-0.3...
r45185 ChannelMessage::Data(b'r', data) => {
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 return message::parse_result_code(data);
Yuya Nishihara
rust-chg: indent process_message() to prepare mass rewrite to futures-0.3...
r45185 }
ChannelMessage::Data(..) => {
// just ignores data sent to optional channel
}
Martin von Zweigbergk
rust: move rustfmt.toml to repo root so it can be used by `hg fix`...
r46195 ChannelMessage::InputRequest(..)
| ChannelMessage::LineRequest(..) => {
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 return Err(io::Error::new(
io::ErrorKind::InvalidData,
"unsupported request",
));
}
Yuya Nishihara
rust-chg: indent process_message() to prepare mass rewrite to futures-0.3...
r45185 ChannelMessage::SystemRequest(data) => {
let (cmd_type, cmd_spec) = message::parse_command_spec(data)?;
match cmd_type {
CommandType::Pager => {
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 // server spins new command loop while pager request is
// in progress, which can be terminated by "" command.
let pin = handler.spawn_pager(&cmd_spec).await?;
Martin von Zweigbergk
rust: move rustfmt.toml to repo root so it can be used by `hg fix`...
r46195 attachio::attach_io(proto, &io::stdin(), &pin, &pin)
.await?;
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 proto.send_command("").await?; // terminator
Yuya Nishihara
rust-chg: indent process_message() to prepare mass rewrite to futures-0.3...
r45185 }
CommandType::System => {
Yuya Nishihara
rust-chg: reimplement run_command operation as async function...
r45235 let code = handler.run_system(&cmd_spec).await?;
let data = message::pack_result_code(code);
proto.send_data(data).await?;
Yuya Nishihara
rust-chg: indent process_message() to prepare mass rewrite to futures-0.3...
r45185 }
Yuya Nishihara
rust-chg: add state machine to handle "runcommand" request with cHg extension...
r40011 }
}
}
}
}