pijul/pijul - Change CGBNLOKSZE7J47TTH7GKUZ5KSJRD36DVIRSR3DTWKS5RG4HDJKOAC

add --no-pager option to cli, pager function respects cli option and user config files

Created by ammkrn on April 8, 2022

CGBNLOKSZE7J47TTH7GKUZ5KSJRD36DVIRSR3DTWKS5RG4HDJKOAC

Dependencies

In discussions

#665 Allow users to disable pager

Change contents

Insertion in pijul/src/main.rs at line 29 [6.83981]

[6.84486]

    /// Run without using the pager
    #[clap(long = "no-pager")]
    no_pager: bool,

Replacement in pijul/src/main.rs at line 234 [6.83981]

B:BD[6.88438] → [7.84:123]

        SubCommand::Log(l) => l.run(),

[6.88438]

[7.123]

        SubCommand::Log(l) => l.run(opts.no_pager),

Replacement in pijul/src/main.rs at line 238 [6.83981]
∅:D[7.222] → [8.231:277]
B:BD[6.88636] → [8.231:277]
```
        SubCommand::Diff(diff) => diff.run(),
```
[7.222]
[6.88682]
```
        SubCommand::Diff(diff) => diff.run(opts.no_pager),
```

Replacement in pijul/src/main.rs at line 241 [6.83981]

B:BD[6.88786] → [7.223:275]

        SubCommand::Change(change) => change.run(),

[6.88786]

[7.275]

        SubCommand::Change(change) => change.run(opts.no_pager),

Replacement in pijul/src/main.rs at line 258 [6.83981]

B:BD[6.89598] → [7.932:1027]

        SubCommand::Credit(credit) => credit.run(),
        SubCommand::Tag(tag) => tag.run(),

[6.89598]

[9.39]

        SubCommand::Credit(credit) => credit.run(opts.no_pager),
        SubCommand::Tag(tag) => tag.run(opts.no_pager),

Replacement in pijul/src/commands/tag.rs at line 86 [10.74]

B:BD[10.1480] → [7.1081:1133]

    pub fn run(self) -> Result<(), anyhow::Error> {

[10.1480]

[10.1538]

    pub fn run(self, cli_no_pager: bool) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/tag.rs at line 250 [10.74]

∅:D[4.620] → [11.817:849]

B:BD[11.817] → [11.817:849]

                super::pager();

[4.620]

[12.3129]

                super::pager(Some(cli_no_pager), repo.config.pager.as_ref());

Insertion in pijul/src/commands/mod.rs at line 123 [6.133619]

[13.3]

[14.0]

/// Respect the presence of the `--no-pager` CLI option as well as  the `pager` key/value
/// in both the user's repository config, and their global config. The global configuration
/// requires no additional arguments, but the other two are optional to cover cases in which
/// that information is not available.

Replacement in pijul/src/commands/mod.rs at line 128 [6.133619]

B:BD[14.13] → [15.0:21]

∅:D[15.21] → [14.14:71]

B:BD[13.29] → [14.14:71]

fn pager() -> bool {
    if let Ok(less) = std::process::Command::new("less")

[14.13]

[14.71]

fn pager(cli_no_pager: Option<bool>, repo_config_pager: Option<&crate::config::Choice>) -> bool {
    if let Some(true) = cli_no_pager {
        return false;
    } else if let Some(crate::config::Choice::Never) = repo_config_pager {
        return false;
    } else if let Some(crate::config::Choice::Never) = crate::config::Global::load()
        .ok()
        .and_then(|(global, _)| global.pager)
    {
        return false;
    } else if let Ok(less) = std::process::Command::new("less")

Deletion in pijul/src/commands/log.rs at line 58 [6.134376]
B:BD[16.311] → [16.311:354]
```
        let repo_path = repo.path.clone();
```
Deletion in pijul/src/commands/log.rs at line 78 [6.134376]
B:BD[16.1253] → [16.1253:1289]
```
        let changes = repo.changes;
```
Insertion in pijul/src/commands/log.rs at line 92 [6.134376]
[16.1526]
[16.1526]
```
            repo,
```
Deletion in pijul/src/commands/log.rs at line 94 [6.134376]
B:BD[16.1543] → [16.1543:1587]
```
            changes,
            repo_path,
```
Insertion in pijul/src/commands/log.rs at line 269 [6.134376]
[17.7288]
[17.7288]
```
    /// The parsed CLI command
    cmd: Log,
```

Replacement in pijul/src/commands/log.rs at line 272 [6.134376]

B:BD[17.7302] → [17.7302:7400]

    changes: libpijul::changestore::filesystem::FileSystem,
    cmd: Log,
    repo_path: PathBuf,

[17.7302]

[17.7400]

    repo: Repository,

Replacement in pijul/src/commands/log.rs at line 326 [6.134376]

B:BD[17.10703] → [3.410:491]

        let inodes = get_inodes(&self.txn, &self.repo_path, &self.cmd.filters)?;

[17.10703]

[3.491]

        let inodes = get_inodes(&self.txn, &self.repo.path, &self.cmd.filters)?;

Replacement in pijul/src/commands/log.rs at line 380 [6.134376]
∅:D[18.2264] → [17.12512:12570]
B:BD[17.12512] → [17.12512:12570]
```
        let header = self.changes.get_header(&h.into())?;
```
[18.2264]
[17.12570]
```
        let header = self.repo.changes.get_header(&h.into())?;
```

Replacement in pijul/src/commands/log.rs at line 450 [6.134376]

∅:D[16.3949] → [17.14212:14264]

B:BD[17.14212] → [17.14212:14264]

    pub fn run(self) -> Result<(), anyhow::Error> {

[16.3949]

[17.14264]

    pub fn run(self, cli_no_pager: bool) -> Result<(), anyhow::Error> {
        let log_iter = LogIterator::try_from(self)?;

Replacement in pijul/src/commands/log.rs at line 453 [6.134376]

B:BD[17.14308] → [17.14308:14372]

        match self.output_format.as_ref().map(|s| s.as_str()) {

[17.14308]

[17.14372]


        super::pager(Some(cli_no_pager), log_iter.repo.config.pager.as_ref());
        match log_iter.cmd.output_format.as_ref().map(|s| s.as_str()) {

Replacement in pijul/src/commands/log.rs at line 458 [6.134376]

B:BD[17.14431] → [17.14431:14586]

B:BD[17.14586] → [16.3950:4288]

                serde_json::to_writer_pretty(&mut stdout, &LogIterator::try_from(self)?)?
            }
            _ => {
                super::pager();
                LogIterator::try_from(self)?.for_each(|entry| {
                    match write!(&mut stdout, "{}", entry) {
                        Ok(_) => Ok(()),
                        Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                        Err(e) => Err(e),
                    }
                })?

[17.14431]

[6.136485]

                serde_json::to_writer_pretty(&mut stdout, &log_iter)?

Insertion in pijul/src/commands/log.rs at line 460 [6.134376]

[6.136499]

            _ => log_iter.for_each(|entry| match write!(&mut stdout, "{}", entry) {
                Ok(_) => Ok(()),
                Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                Err(e) => Err(e),
            })?,

Replacement in pijul/src/commands/diff.rs at line 38 [6.173551]

B:BD[6.174051] → [7.2143:2199]

    pub fn run(mut self) -> Result<(), anyhow::Error> {

[6.174051]

[19.24003]

    pub fn run(mut self, cli_no_pager: bool) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/diff.rs at line 135 [6.173551]

B:BD[6.175777] → [20.316:351]

        let colors = is_colored();

[6.175777]

        let colors = is_colored(Some(cli_no_pager), repo.config.pager.as_ref());

Replacement in pijul/src/commands/diff.rs at line 339 [6.173551]

B:BD[20.400] → [20.400:430]

pub fn is_colored() -> bool {

[20.400]

[20.430]

pub fn is_colored(
    cli_no_pager: Option<bool>,
    repo_config_pager: Option<&crate::config::Choice>,
) -> bool {

Replacement in pijul/src/commands/diff.rs at line 353 [6.173551]

B:BD[20.845] → [20.845:877]

                super::pager();

[20.845]

[20.877]

                super::pager(cli_no_pager, repo_config_pager);

Replacement in pijul/src/commands/diff.rs at line 357 [6.173551]

B:BD[20.905] → [2.0:34]

        colors &= super::pager();

[20.905]

[15.2096]

        colors &= super::pager(cli_no_pager, repo_config_pager);

Replacement in pijul/src/commands/credit.rs at line 26 [6.178684]

B:BD[6.179133] → [7.2253:2305]

    pub fn run(self) -> Result<(), anyhow::Error> {

[6.179133]

[6.179185]

    pub fn run(self, cli_no_pager: bool) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/credit.rs at line 52 [6.178684]
B:BD[6.180284] → [13.213:237]
```
        super::pager();
```
[6.180243]
[12.16703]
```
        super::pager(Some(cli_no_pager), repo.config.pager.as_ref());
```

Replacement in pijul/src/commands/change.rs at line 20 [6.189306]

B:BD[6.189681] → [7.2443:2495]

    pub fn run(self) -> Result<(), anyhow::Error> {

[6.189681]

[19.24784]

    pub fn run(self, cli_no_pager: bool) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/change.rs at line 42 [6.189306]

B:BD[21.419] → [20.952:1000]

        let colors = super::diff::is_colored();

[6.190342]

[15.2150]

        let colors = super::diff::is_colored(Some(cli_no_pager), repo.config.pager.as_ref());

Replacement in Cargo.lock at line 1093 [6.1030385]
B:BD[22.22930] → [5.2853:2876]
```
version = "1.0.0-beta"
```
[22.22930]
[22.22957]
```
version = "1.0.0-beta.1"
```