pijul/pijul - Change ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC

Colours in diff and change: separating concerns and dependencies

Created by pmeunier on January 13, 2021

ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC

Dependencies

In channels

main

In discussions

#104 Diffs and changes should have color when printed to stdout

Change contents

Replacement in pijul/src/commands/mod.rs at line 100 [7.133619]
∅:D[5.28] → [6.16:29]
∅:D[4.13] → [6.16:29]
B:BD[6.16] → [6.16:29]
```
fn pager() {
```
[4.13]
[4.14]
```
fn pager() -> bool {
```

Replacement in pijul/src/commands/mod.rs at line 113 [7.133619]

B:BD[4.424] → [4.424:485]

                pager::Pager::with_pager("less -RF").setup()

[4.424]

[4.485]

                pager::Pager::with_pager("less -RF").setup();
                return true;

Replacement in pijul/src/commands/mod.rs at line 116 [7.133619]

B:BD[4.506] → [4.506:550]

                pager::Pager::new().setup()

[4.506]

[4.550]

                pager::Pager::new().setup();

Insertion in pijul/src/commands/mod.rs at line 120 [7.133619]
[4.580]
[8.2909]
```
    false
```
Replacement in pijul/src/commands/mod.rs at line 124 [7.133619]
∅:D[5.62] → [9.0:14]
∅:D[4.599] → [9.0:14]
B:BD[6.98] → [9.0:14]
```
fn pager() {}
```
[4.599]
[3.2970]
```
fn pager() -> bool {
    false
}
```
Replacement in pijul/src/commands/diff.rs at line 90 [7.173551]
B:BD[7.175777] → [6.188:212]
```
        super::pager();
```
[7.175777]
[7.175777]
```
        let pager_is_colored = super::pager();
```

Replacement in pijul/src/commands/diff.rs at line 161 [7.173551]

B:BD[7.177283] → [7.177283:177323]

                &mut std::io::stdout(),

[7.177283]

[7.177323]

                Colored {
                    w: termcolor::StandardStream::stdout(termcolor::ColorChoice::Auto),
                    colors: atty::is(atty::Stream::Stdout) || pager_is_colored,
                },

Insertion in pijul/src/commands/diff.rs at line 185 [7.173551]

[7.177744]

}
pub struct Colored<W> {
    pub w: W,
    pub colors: bool,
}
impl<W: std::io::Write> std::io::Write for Colored<W> {
    fn write(&mut self, s: &[u8]) -> Result<usize, std::io::Error> {
        self.w.write(s)
    }
    fn flush(&mut self) -> Result<(), std::io::Error> {
        self.w.flush()
    }
}
use termcolor::*;
impl<W: termcolor::WriteColor> libpijul::change::WriteChangeLine for Colored<W> {
    fn write_change_line(&mut self, pref: &str, contents: &str) -> Result<(), std::io::Error> {
        if self.colors {
            let col = if pref == "+" {
                Color::Green
            } else {
                Color::Red
            };
            self.w.set_color(ColorSpec::new().set_fg(Some(col)))?;
            write!(self.w, "{} {}", pref, contents)?;
            self.w.reset()
        } else {
            write!(self.w, "{} {}", pref, contents)
        }
    }
    fn write_change_line_binary(
        &mut self,
        pref: &str,
        contents: &[u8],
    ) -> Result<(), std::io::Error> {
        if self.colors {
            let col = if pref == "+" {
                Color::Green
            } else {
                Color::Red
            };
            self.w.set_color(ColorSpec::new().set_fg(Some(col)))?;
            write!(
                self.w,
                "{}b{}",
                pref,
                data_encoding::BASE64.encode(contents)
            )?;
            self.w.reset()
        } else {
            write!(
                self.w,
                "{}b{}",
                pref,
                data_encoding::BASE64.encode(contents)
            )
        }
    }

Replacement in pijul/src/commands/change.rs at line 44 [7.189306]

∅:D[10.419] → [7.190911:190976]

B:BD[7.190911] → [7.190911:190976]

B:BD[7.190976] → [6.238:262]

∅:D[11.244] → [7.190976:191046]

∅:D[6.262] → [7.190976:191046]

B:BD[7.190976] → [7.190976:191046]

        let o = std::io::stdout();
        let mut o = o.lock();
        super::pager();
        change.write(&changes, Some(hash), file_name, true, &mut o)?;

[10.419]

[7.191046]

        let pager_is_colored = super::pager();
        change.write(
            &changes,
            Some(hash),
            file_name,
            true,
            super::diff::Colored {
                w: termcolor::StandardStream::stdout(termcolor::ColorChoice::Auto),
                colors: atty::is(atty::Stream::Stdout) || pager_is_colored,
            },
        )?;

Insertion in pijul/Cargo.toml at line 78 [7.196374]
[12.2859]
[2.355]
```
termcolor = "1.1"
atty = "0.2"
```
Insertion in libpijul/src/change.rs at line 10 [7.831311]
[13.36136]
[13.36136]
```
pub use text_changes::WriteChangeLine;
```

Replacement in libpijul/src/change/text_changes.rs at line 86 [13.37976]

B:BD[13.40602] → [13.40602:40698]

    pub fn write<W: Write, C: ChangeStore, F: FnMut(&Local, Position<Option<Hash>>) -> String>(

[13.40602]

[13.40698]

    pub fn write<W: WriteChangeLine, C: ChangeStore, F: FnMut(&Local, Position<Option<Hash>>) -> String>(

Replacement in libpijul/src/change/text_changes.rs at line 306 [13.37976]
B:BD[13.48493] → [13.48493:48520]
```
        W: std::io::Write,
```
[13.48493]
[13.48520]
```
        W: WriteChangeLine,
```
Replacement in libpijul/src/change/text_changes.rs at line 315 [13.37976]
B:BD[13.48744] → [13.48744:48762]
```
        mut w: W,
```
[13.48744]
[13.48762]
```
        mut w: &mut W,
```

Replacement in libpijul/src/change/text_changes.rs at line 367 [13.37976]

B:BD[13.50865] → [13.50865:50953]

                    print_change_contents(&mut w, changes, contents, change_contents)?;

[13.50865]

[13.50953]

                    print_change_contents(w, changes, contents, change_contents)?;

Replacement in libpijul/src/change/text_changes.rs at line 384 [13.37976]

B:BD[13.51484] → [13.51484:51572]

                    print_change_contents(&mut w, changes, contents, change_contents)?;

[13.51484]

[13.51572]

                    print_change_contents(w, changes, contents, change_contents)?;

Replacement in libpijul/src/change/text_changes.rs at line 426 [13.37976]

B:BD[13.53215] → [13.53215:53268]

                    print_contents(&mut w, "+", c)?;

[13.53215]

[13.53268]

                    print_contents(w, "+", c)?;

Replacement in libpijul/src/change/text_changes.rs at line 438 [13.37976]

B:BD[13.53680] → [13.53680:53762]

                print_change_contents(&mut w, changes, change, change_contents)?;

[13.53680]

[13.53762]

                print_change_contents(w, changes, change, change_contents)?;

Replacement in libpijul/src/change/text_changes.rs at line 451 [13.37976]

B:BD[13.54193] → [13.54193:54362]

                print_change_contents(&mut w, changes, change, change_contents)?;
                print_change_contents(&mut w, changes, replacement, change_contents)?;

[13.54193]

[13.54362]

                print_change_contents(w, changes, change, change_contents)?;
                print_change_contents(w, changes, replacement, change_contents)?;

Replacement in libpijul/src/change/text_changes.rs at line 480 [13.37976]

B:BD[13.55518] → [13.55518:55600]

                print_change_contents(&mut w, changes, change, change_contents)?;

[13.55518]

[13.55600]

                print_change_contents(w, changes, change, change_contents)?;

Replacement in libpijul/src/change/text_changes.rs at line 492 [13.37976]

B:BD[13.56002] → [13.56002:56084]

                print_change_contents(&mut w, changes, change, change_contents)?;

[13.56002]

[13.56084]

                print_change_contents(w, changes, change, change_contents)?;

Replacement in libpijul/src/change/text_changes.rs at line 504 [13.37976]

B:BD[13.56473] → [13.56473:56555]

                print_change_contents(&mut w, changes, change, change_contents)?;

[13.56473]

[13.56555]

                print_change_contents(w, changes, change, change_contents)?;

Replacement in libpijul/src/change/text_changes.rs at line 1186 [13.37976]

B:BD[13.84600] → [13.84600:84642]

pub fn print_contents<W: std::io::Write>(

[13.84600]

[13.84642]

pub trait WriteChangeLine: std::io::Write {
    fn write_change_line(&mut self, pref: &str, contents: &str) -> Result<(), std::io::Error> {
        write!(self, "{} {}", pref, contents)
    }
    fn write_change_line_binary(&mut self, pref: &str, contents: &[u8]) -> Result<(), std::io::Error> {
        write!(self, "{}b{}", pref, data_encoding::BASE64.encode(contents))
    }
}
impl WriteChangeLine for &mut Vec<u8> {}
pub fn print_contents<W: WriteChangeLine>(

Replacement in libpijul/src/change/text_changes.rs at line 1206 [13.37976]
B:BD[13.84951] → [13.84951:84993]
```
            write!(w, "{} {}", pref, a)?;
```
[13.84951]
[13.84993]
```
            w.write_change_line(pref, a)?
```
Replacement in libpijul/src/change/text_changes.rs at line 1209 [13.37976]
B:BD[13.85037] → [13.85037:85088]
```
            writeln!(w, "{} {}", pref, contents)?;
```
[13.85037]
[13.85088]
```
            w.write_change_line(pref, contents)?
```

Replacement in libpijul/src/change/text_changes.rs at line 1217 [13.37976]

B:BD[13.85207] → [13.85207:85272]

pub fn print_change_contents<W: std::io::Write, C: ChangeStore>(

[13.85207]

[13.85272]

pub fn print_change_contents<W: WriteChangeLine, C: ChangeStore>(

Colours in diff and change: separating concerns and dependencies

Dependencies

In channels

In discussions

Change contents

Replacement in pijul/src/commands/mod.rs at line 100 [7.133619]

Replacement in pijul/src/commands/mod.rs at line 113 [7.133619]

Replacement in pijul/src/commands/mod.rs at line 116 [7.133619]

Insertion in pijul/src/commands/mod.rs at line 120 [7.133619]

Replacement in pijul/src/commands/mod.rs at line 124 [7.133619]

Replacement in pijul/src/commands/diff.rs at line 90 [7.173551]