mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-16 09:11:55 +00:00
7c2400f3e5
Teach Ui's writing functions to write to a pager without touching the process's file descriptors. This is done by introducing UiOutput::Paged, which spawns a pager that Ui's functions can write to. The pager program can be chosen via `ui.pager`. (defaults to Defaults to $PAGER, and 'less' if that is unset (falling back to 'less' also makes the tests pass). Currently, commands are paginated if: - they have "long" output (as defined by jj developers) - jj is invoked in a terminal The next commit will allow pagination to be turned off via a CLI option. More complex pagination toggling (e.g. showing a pager even if the output doesn't look like a terminal, using a pager for shorter ouput) is left for a future PR.
64 lines
2.5 KiB
Rust
64 lines
2.5 KiB
Rust
// Copyright 2020 The Jujutsu Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use jujutsu::cli_util::{create_ui, handle_command_result, parse_args, CommandError};
|
|
use jujutsu::commands::{default_app, run_command};
|
|
use jujutsu::ui::Ui;
|
|
use tracing::metadata::LevelFilter;
|
|
use tracing_subscriber::prelude::*;
|
|
use tracing_subscriber::reload::Handle;
|
|
use tracing_subscriber::EnvFilter;
|
|
|
|
fn run(
|
|
ui: &mut Ui,
|
|
reload_log_filter: Handle<EnvFilter, impl tracing::Subscriber>,
|
|
) -> Result<(), CommandError> {
|
|
let app = default_app();
|
|
let (command_helper, matches) = parse_args(ui, app, std::env::args_os())?;
|
|
if command_helper.global_args().verbose {
|
|
reload_log_filter
|
|
.modify(|filter| {
|
|
*filter = EnvFilter::builder()
|
|
.with_default_directive(LevelFilter::DEBUG.into())
|
|
.from_env_lossy()
|
|
})
|
|
.map_err(|err| {
|
|
CommandError::InternalError(format!("failed to enable verbose logging: {:?}", err))
|
|
})?;
|
|
tracing::debug!("verbose logging enabled");
|
|
}
|
|
run_command(ui, &command_helper, &matches)
|
|
}
|
|
|
|
fn main() {
|
|
// TODO(@rslabbert): restructure logging filter setup to better handle
|
|
// having verbose logging set up as early as possible, and to support
|
|
// custom commands. See discussion on:
|
|
// https://github.com/martinvonz/jj/pull/771
|
|
let filter = EnvFilter::builder()
|
|
.with_default_directive(LevelFilter::INFO.into())
|
|
.from_env_lossy();
|
|
let (filter, reload_log_filter) = tracing_subscriber::reload::Layer::new(filter);
|
|
tracing_subscriber::registry()
|
|
.with(filter)
|
|
.with(tracing_subscriber::fmt::Layer::default().with_writer(std::io::stderr))
|
|
.init();
|
|
|
|
jujutsu::cleanup_guard::init();
|
|
let (mut ui, result) = create_ui();
|
|
let result = result.and_then(|()| run(&mut ui, reload_log_filter));
|
|
let exit_code = handle_command_result(&mut ui, result);
|
|
ui.finalize_writes();
|
|
std::process::exit(exit_code);
|
|
}
|