oknozor/pijul - Change U6TQX5Z2NF6GX3SRLUBQGCZ7WAXNYMWWZ2YMADUSG4EWVKNV2BIAC

pager function respects cli option and user config files, PAGER env var

Created by ammkrn on April 8, 2022

U6TQX5Z2NF6GX3SRLUBQGCZ7WAXNYMWWZ2YMADUSG4EWVKNV2BIAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/tag.rs at line 250 [6.74]
∅:D[4.620] → [5.817:849]
B:BD[5.817] → [5.817:849]
```
                super::pager();
```
[4.620]
[7.3129]
```
                super::pager(repo.config.pager.as_ref());
```

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

[8.3]

[9.0]

/// Respect the `pager` key/value pair 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. Users can also disable the pager by not setting 
/// the `PAGER` environment variable.

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

B:BD[9.13] → [11.0:21]

∅:D[11.21] → [9.14:71]

B:BD[8.29] → [9.14:71]

B:BD[9.71] → [9.71:119]

fn pager() -> bool {
    if let Ok(less) = std::process::Command::new("less")
        .args(&["--version"])
        .output()

[9.13]

[9.119]

fn pager(repo_config_pager: Option<&crate::config::Choice>) -> bool {
    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)

Replacement in pijul/src/commands/mod.rs at line 135 [10.133619]

B:BD[9.125] → [9.125:424]

B:BD[9.424] → [11.22:113]

∅:D[11.113] → [9.485:506]

B:BD[9.485] → [9.485:506]

B:BD[9.506] → [11.114:159]

        let regex = regex::bytes::Regex::new("less ([0-9]+)").unwrap();
        if let Some(caps) = regex.captures(&less.stdout) {
            if std::str::from_utf8(&caps[1])
                .unwrap()
                .parse::<usize>()
                .unwrap()
                >= 530
            {
                pager::Pager::with_pager("less -RF").setup();
                return true;
            } else {
                pager::Pager::new().setup();

[9.125]

[9.550]

        return false;
    } else if let Ok(pager_env_var) = std::env::var("PAGER") {
        if !pager_env_var.is_empty() {
            match pager_env_var.as_str() {
                "less" => {
                    if let Ok(pager_output) = std::process::Command::new(pager_env_var)
                        .args(&["--version"])
                        .output()
                    {
                        let regex = regex::bytes::Regex::new("less ([0-9]+)").unwrap();
                        if let Some(caps) = regex.captures(&pager_output.stdout) {
                            if std::str::from_utf8(&caps[1])
                                .unwrap()
                                .parse::<usize>()
                                .unwrap()
                                >= 530
                            {
                                pager::Pager::with_pager("less -RF").setup();
                                return true;
                            } else {
                                pager::Pager::new().setup();
                            }
                        }
                    }
                }
                owise => {
                    pager::Pager::with_pager(owise).setup();
                }

Deletion in pijul/src/commands/log.rs at line 58 [10.134376]
B:BD[12.311] → [12.311:354]
```
        let repo_path = repo.path.clone();
```
Deletion in pijul/src/commands/log.rs at line 78 [10.134376]
B:BD[12.1253] → [12.1253:1289]
```
        let changes = repo.changes;
```
Insertion in pijul/src/commands/log.rs at line 92 [10.134376]
[12.1526]
[12.1526]
```
            repo,
```
Deletion in pijul/src/commands/log.rs at line 94 [10.134376]
B:BD[12.1543] → [12.1543:1587]
```
            changes,
            repo_path,
```
Insertion in pijul/src/commands/log.rs at line 269 [10.134376]
[13.7288]
[13.7288]
```
    /// The parsed CLI command
    cmd: Log,
```

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

B:BD[13.7302] → [13.7302:7400]

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

[13.7302]

[13.7400]

    repo: Repository,

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

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

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

[13.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 [10.134376]
∅:D[14.2264] → [13.12512:12570]
B:BD[13.12512] → [13.12512:12570]
```
        let header = self.changes.get_header(&h.into())?;
```
[14.2264]
[13.12570]
```
        let header = self.repo.changes.get_header(&h.into())?;
```
Insertion in pijul/src/commands/log.rs at line 451 [10.134376]
[13.14264]
[13.14264]
```
        let log_iter = LogIterator::try_from(self)?;
```

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

B:BD[13.14308] → [13.14308:14372]

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

[13.14308]

[13.14372]


        super::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 [10.134376]

B:BD[13.14431] → [13.14431:14521]

                serde_json::to_writer_pretty(&mut stdout, &LogIterator::try_from(self)?)?

[13.14431]

[13.14521]

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

Replacement in pijul/src/commands/log.rs at line 460 [10.134376]

B:BD[13.14535] → [13.14535:14586]

B:BD[13.14586] → [12.3950:4288]

∅:D[12.4288] → [10.136485:136499]

∅:D[13.14683] → [10.136485:136499]

B:BD[10.136485] → [10.136485:136499]

            _ => {
                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),
                    }
                })?
            }

[13.14535]

[10.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 135 [10.173551]
B:BD[10.175777] → [15.316:351]
```
        let colors = is_colored();
```
[10.175777]
[10.175777]
```
        let colors = is_colored(repo.config.pager.as_ref());
```
Replacement in pijul/src/commands/diff.rs at line 339 [10.173551]
B:BD[15.400] → [15.400:430]
```
pub fn is_colored() -> bool {
```
[15.400]
[15.430]
```
pub fn is_colored(repo_config_pager: Option<&crate::config::Choice>) -> bool {
```

Replacement in pijul/src/commands/diff.rs at line 350 [10.173551]

B:BD[15.845] → [15.845:877]

                super::pager();

[15.845]

[15.877]

                super::pager(repo_config_pager);

Replacement in pijul/src/commands/diff.rs at line 354 [10.173551]
B:BD[15.905] → [2.0:34]
```
        colors &= super::pager();
```
[15.905]
[11.2096]
```
        colors &= super::pager(repo_config_pager);
```
Replacement in pijul/src/commands/credit.rs at line 52 [10.178684]
B:BD[10.180284] → [8.213:237]
```
        super::pager();
```
[10.180243]
[7.16703]
```
        super::pager(repo.config.pager.as_ref());
```

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

B:BD[16.419] → [15.952:1000]

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

[10.190342]

[11.2150]

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

pager function respects cli option and user config files, PAGER env var

Dependencies

In channels

Change contents

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

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

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

Replacement in pijul/src/commands/mod.rs at line 135 [10.133619]

Deletion in pijul/src/commands/log.rs at line 58 [10.134376]

Deletion in pijul/src/commands/log.rs at line 78 [10.134376]

Insertion in pijul/src/commands/log.rs at line 92 [10.134376]

Deletion in pijul/src/commands/log.rs at line 94 [10.134376]

Insertion in pijul/src/commands/log.rs at line 269 [10.134376]

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

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

Replacement in pijul/src/commands/log.rs at line 380 [10.134376]

Insertion in pijul/src/commands/log.rs at line 451 [10.134376]

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

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

Replacement in pijul/src/commands/log.rs at line 460 [10.134376]

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

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

Replacement in pijul/src/commands/diff.rs at line 350 [10.173551]

Replacement in pijul/src/commands/diff.rs at line 354 [10.173551]

Replacement in pijul/src/commands/credit.rs at line 52 [10.178684]

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