##// END OF EJS Templates
darwin: use vim, not vi, to avoid data-loss inducing posix behavior...
darwin: use vim, not vi, to avoid data-loss inducing posix behavior Apple's version of vim, available at opensource.apple.com/release/macos-1015.html (for Catalina, but this behavior has been there for a while) has several tweaks from the version of vim from vim.org. Most of these tweaks appear to be for "Unix2003" compatibility. One of the tweaks is that if any ex command raises an error, the entire process will (when you exit, possibly minutes/hours later) also exit non-zero. Ex commands are things like `:foo`. Luckily, they only enabled this if vim was executed (via a symlink or copying the binary) as `vi` or `ex`. If you start it as `vim`, it doesn't have this behavior, so let's do that. To see this in action, run the following two commands on macOS: ``` $ vi -c ':unknown' -c ':qa' ; echo $? 1 $ vim -c ':unknown' -c ':qa' ; echo $? 0 ``` We don't want to start ignoring non-zero return types from the editor because that will mean you can't use `:cquit` to intentionally exit 1 (which, shows up as 2 if you combine an ex command error and a cquit, but only a 1 if you just use cquit, so we can't differentiate between the two statuses). Since we can't differentiate, we have to assume that all non-zero exit codes are intentional and an indication of the user's desire to not continue with whatever we're doing. If this was a complicated `hg split` or `hg histedit`, this is especially disastrous :( Differential Revision: https://phab.mercurial-scm.org/D8321

File last commit:

r44270:ce088b38 default
r45085:c23877cb stable
Show More
main.rs
100 lines | 2.9 KiB | application/rls-services+xml | RustLexer
Yuya Nishihara
rust-chg: add project skeleton...
r40003 // 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.
Yuya Nishihara
rust-chg: add main program...
r40015 extern crate chg;
extern crate futures;
Yuya Nishihara
rust-chg: install logger if $CHGDEBUG is set...
r40324 extern crate log;
Yuya Nishihara
rust-chg: add main program...
r40015 extern crate tokio;
extern crate tokio_hglib;
use chg::locator;
Yuya Nishihara
rust-chg: install signal handlers to forward signals to server...
r40156 use chg::procutil;
Gregory Szorc
rust: run rustfmt...
r44270 use chg::{ChgClientExt, ChgUiHandler};
Yuya Nishihara
rust-chg: add main program...
r40015 use futures::sync::oneshot;
use std::env;
use std::io;
use std::process;
Yuya Nishihara
rust-chg: install logger if $CHGDEBUG is set...
r40324 use std::time::Instant;
Yuya Nishihara
rust-chg: add main program...
r40015 use tokio::prelude::*;
use tokio_hglib::UnixClient;
Yuya Nishihara
rust-chg: install logger if $CHGDEBUG is set...
r40324 struct DebugLogger {
start: Instant,
}
impl DebugLogger {
pub fn new() -> DebugLogger {
DebugLogger {
start: Instant::now(),
}
}
}
impl log::Log for DebugLogger {
fn enabled(&self, metadata: &log::Metadata) -> bool {
metadata.target().starts_with("chg::")
}
fn log(&self, record: &log::Record) {
if self.enabled(record.metadata()) {
// just make the output looks similar to chg of C
let l = format!("{}", record.level()).to_lowercase();
let t = self.start.elapsed();
Gregory Szorc
rust: run rustfmt...
r44270 writeln!(
io::stderr(),
"chg: {}: {}.{:06} {}",
l,
t.as_secs(),
t.subsec_micros(),
record.args()
)
.unwrap_or(());
Yuya Nishihara
rust-chg: install logger if $CHGDEBUG is set...
r40324 }
}
Gregory Szorc
rust: run rustfmt...
r44270 fn flush(&self) {}
Yuya Nishihara
rust-chg: install logger if $CHGDEBUG is set...
r40324 }
Yuya Nishihara
rust-chg: add project skeleton...
r40003 fn main() {
Yuya Nishihara
rust-chg: install logger if $CHGDEBUG is set...
r40324 if env::var_os("CHGDEBUG").is_some() {
log::set_boxed_logger(Box::new(DebugLogger::new()))
.expect("any logger should not be installed yet");
log::set_max_level(log::LevelFilter::Debug);
}
Yuya Nishihara
rust-chg: add main program...
r40015 let code = run().unwrap_or_else(|err| {
Yuya Nishihara
rust-chg: suppress panic while writing chg error to stderr...
r40322 writeln!(io::stderr(), "chg: abort: {}", err).unwrap_or(());
Yuya Nishihara
rust-chg: add main program...
r40015 255
});
process::exit(code);
Yuya Nishihara
rust-chg: add project skeleton...
r40003 }
Yuya Nishihara
rust-chg: add main program...
r40015
fn run() -> io::Result<i32> {
let current_dir = env::current_dir()?;
let sock_path = locator::prepare_server_socket_path()?;
let handler = ChgUiHandler::new();
let (result_tx, result_rx) = oneshot::channel();
let fut = UnixClient::connect(sock_path)
Gregory Szorc
rust: run rustfmt...
r44270 .and_then(|client| client.set_current_dir(current_dir))
.and_then(|client| client.attach_io(io::stdin(), io::stdout(), io::stderr()))
Yuya Nishihara
rust-chg: add main program...
r40015 .and_then(|client| {
Yuya Nishihara
rust-chg: install signal handlers to forward signals to server...
r40156 let pid = client.server_spec().process_id.unwrap();
let pgid = client.server_spec().process_group_id;
procutil::setup_signal_handler_once(pid, pgid)?;
Ok(client)
})
Gregory Szorc
rust: run rustfmt...
r44270 .and_then(|client| client.run_command_chg(handler, env::args_os().skip(1)))
Yuya Nishihara
rust-chg: add main program...
r40015 .map(|(_client, _handler, code)| {
Yuya Nishihara
rust-chg: install signal handlers to forward signals to server...
r40156 procutil::restore_signal_handler_once()?;
Yuya Nishihara
rust-chg: add main program...
r40015 Ok(code)
})
Gregory Szorc
rust: run rustfmt...
r44270 .or_else(|err| Ok(Err(err))) // pass back error to caller
Yuya Nishihara
rust-chg: add main program...
r40015 .map(|res| result_tx.send(res).unwrap());
tokio::run(fut);
Gregory Szorc
rust: run rustfmt...
r44270 result_rx.wait().unwrap_or(Err(io::Error::new(
io::ErrorKind::Other,
"no exit code set",
)))
Yuya Nishihara
rust-chg: add main program...
r40015 }