pijul/pijul - Change Q45BC4OC3NSRLJANNOBHENZCFSF7SG2MMYMZR4247CPZXOJ5VSSAC

Refactor `progress` module into its own crate

Although it may not seem like much (visually), I believe that this new implementation should be much more flexible and should allow many more modules to be spun off into their individual crates.

Created by finchie on June 15, 2023

Q45BC4OC3NSRLJANNOBHENZCFSF7SG2MMYMZR4247CPZXOJ5VSSAC

Dependencies

In discussions

#804 Split Pijul CLI into multiple sub-crates

Change contents

File addition: pijul-term (d--x------)
[11.2]
File addition: src (d--x------)
[0.22]

File addition: progress.rs (----------)

[0.39]

use std::time::Duration;
use indicatif::MultiProgress;
use lazy_static::lazy_static;
pub use indicatif::ProgressStyle;
lazy_static! {
    static ref MULTI_PROGRESS: MultiProgress = MultiProgress::new();
}
pub const DOWNLOAD_MESSAGE: &str = "Downloading changes";
pub const APPLY_MESSAGE: &str = "Applying changes";
pub const UPLOAD_MESSAGE: &str = "Uploading changes";
pub const COMPLETE_MESSAGE: &str = "Completing changes";
pub const OUTPUT_MESSAGE: &str = "Outputting repository";
#[derive(Clone, Debug)]
pub struct ProgressBar(Option<indicatif::ProgressBar>);
impl ProgressBar {
    pub fn new(len: u64, message: &str) -> Result<Self, anyhow::Error> {
        let style =
            ProgressStyle::with_template("{msg:<20} [{bar:50}] {pos}/{len} [{elapsed_precise}]")?
                .progress_chars("=> ");
        let progress_bar = indicatif::ProgressBar::new(len)
            .with_style(style)
            .with_message(message.to_owned());
        MULTI_PROGRESS.add(progress_bar.clone());
        progress_bar.enable_steady_tick(Duration::from_millis(15));
        Ok(Self(Some(progress_bar)))
    }
    pub fn hidden() -> Self {
        Self(None)
    }
    pub fn inc(&self, delta: u64) {
        if let Some(progress) = self.0.clone() {
            progress.inc(delta);
        }
    }
    pub fn inner(&self) -> Option<indicatif::ProgressBar> {
        self.0.clone()
    }
    pub fn finish(&self) {
        if let Some(progress) = self.0.clone() {
            progress.finish();
        }
    }
}
#[derive(Clone, Debug)]
pub struct Spinner(indicatif::ProgressBar);
impl Spinner {
    pub fn new(message: &str) -> Result<Self, anyhow::Error> {
        let style = ProgressStyle::with_template("{msg}{spinner}")?
            .tick_strings(&[".  ", ".. ", "...", "   "]);
        let spinner = indicatif::ProgressBar::new_spinner()
            .with_style(style)
            .with_message(message.to_owned());
        spinner.enable_steady_tick(Duration::from_millis(200));
        MULTI_PROGRESS.add(spinner.clone());
        Ok(Self(spinner))
    }
    pub fn finish(&self) -> Result<(), anyhow::Error> {
        self.0.set_style(ProgressStyle::with_template("{msg}")?);
        self.0
            .finish_with_message(format!("{}... done!", self.0.message()));
        Ok(())
    }
}

File addition: lib.rs (----------)
[0.39]
```
pub mod progress;
```

File addition: Cargo.toml (----------)

[0.22]

[package]
name = "pijul-term"
description = "Terminal visualisations for the pijul binary"
version = "0.0.1"
authors = ["Finchie"]
edition = "2018"
repository = "https://nest.pijul.com/pijul/pijul"
license = "GPL-2.0"
include = [ "Cargo.toml", "src" ]
[dependencies]
anyhow = { version = "1.0.71", features = ["backtrace"] }
indicatif = { version = "0.17.5", features = ["improved_unicode"] }
lazy_static = "1.4.0"

File deletion: progress.rs

BF:BFD[12.21414] → [13.5309:5322]

BF:BFD[13.5322] → [13.5323:5323]

∅:D[14.3102] → [13.5324:5395]

B:BD[13.5323] → [13.5324:5395]

B:BD[13.5395] → [13.5395:5396]

∅:D[14.3223] → [13.5396:5458]

B:BD[13.5396] → [13.5396:5458]

∅:D[14.3275] → [13.5494:5496]

B:BD[13.5494] → [13.5494:5496]

B:BD[13.5496] → [13.5496:5497]

B:BD[13.5497] → [13.5497:5541]

∅:D[15.403] → [13.5571:5638]

B:BD[13.5571] → [13.5571:5638]

∅:D[15.719] → [13.5638:5640]

B:BD[13.5638] → [13.5638:5640]

B:BD[13.5640] → [13.5640:5641]

B:BD[13.5641] → [13.5641:5894]

∅:D[14.3664] → [13.5980:6435]

B:BD[13.5980] → [13.5980:6435]

∅:D[14.3678] → [13.6476:6483]

B:BD[13.6476] → [13.6476:6483]

B:BD[13.6483] → [13.6483:6508]

∅:D[14.3703] → [13.6508:6598]

B:BD[13.6508] → [13.6508:6598]

∅:D[14.3753] → [13.6622:6643]

B:BD[13.6622] → [13.6622:6643]

∅:D[14.3875] → [13.6675:6863]

B:BD[13.6675] → [13.6675:6863]

∅:D[14.3930] → [13.6863:6903]

B:BD[13.6863] → [13.6863:6903]

∅:D[14.3955] → [13.6903:7710]

B:BD[13.6903] → [13.6903:7710]

B:BD[13.7710] → [13.7710:7727]

B:BD[13.7727] → [13.7727:7823]

∅:D[14.4093] → [13.7823:7843]

B:BD[13.7823] → [13.7823:7843]

B:BD[13.7843] → [13.7843:7859]

B:BD[13.7859] → [13.7859:8628]

B:BD[13.8628] → [13.8628:8629]

B:BD[13.8629] → [13.8629:8691]

∅:D[16.533] → [13.8733:8734]

B:BD[13.8733] → [13.8733:8734]

B:BD[13.8734] → [13.8734:8816]

B:BD[13.8816] → [17.0:47]

∅:D[15.1428] → [13.9147:9240]

B:BD[13.9147] → [13.9147:9240]

∅:D[16.579] → [13.9630:10422]

B:BD[13.9630] → [13.9630:10422]

B:BD[13.10422] → [13.10422:10428]

B:BD[13.10430] → [13.10430:10431]

B:BD[13.10431] → [13.10431:10451]

∅:D[15.1561] → [13.10451:10953]

B:BD[13.10451] → [13.10451:10953]

∅:D[2.69] → [13.11054:11114]

B:BD[13.11054] → [13.11054:11114]

∅:D[2.94] → [13.11147:11194]

B:BD[13.11147] → [13.11147:11194]

∅:D[2.163] → [13.11271:11582]

B:BD[13.11271] → [13.11271:11582]

B:BD[13.11582] → [13.11582:11605]

B:BD[13.11194] → [2.95:163]

B:BD[13.11114] → [2.70:94]

B:BD[13.10953] → [2.0:69]

B:BD[13.10451] → [15.1429:1560]

B:BD[15.1560] → [15.1560:1561]

B:BD[13.10428] → [13.10428:10430]

B:BD[13.9240] → [16.534:579]

B:BD[17.47] → [15.720:749]

∅:D[6.67] → [15.749:795]

B:BD[15.749] → [15.749:795]

∅:D[6.130] → [15.990:1037]

B:BD[15.990] → [15.990:1037]

∅:D[14.4147] → [15.1096:1428]

B:BD[15.1096] → [15.1096:1428]

B:BD[15.1037] → [14.4094:4147]

B:BD[15.795] → [6.68:130]

B:BD[15.749] → [6.0:67]

B:BD[13.8691] → [16.0:281]

∅:D[3.27] → [16.461:533]

B:BD[16.461] → [16.461:533]

B:BD[16.281] → [3.0:27]

B:BD[13.7823] → [14.3956:3986]

B:BD[14.3986] → [14.3986:3993]

B:BD[14.3993] → [14.3993:4093]

B:BD[13.6903] → [14.3931:3955]

B:BD[13.6863] → [14.3876:3930]

B:BD[13.6643] → [14.3754:3875]

B:BD[13.6598] → [14.3704:3753]

B:BD[13.6508] → [14.3679:3703]

B:BD[13.6435] → [14.3665:3678]

B:BD[13.5894] → [14.3276:3414]

B:BD[14.3414] → [14.3414:3421]

B:BD[14.3421] → [14.3421:3664]

B:BD[13.5638] → [15.404:407]

B:BD[15.407] → [15.407:567]

B:BD[15.567] → [15.567:568]

B:BD[15.568] → [15.568:719]

B:BD[13.5541] → [15.377:403]

B:BD[13.5458] → [14.3224:3275]

B:BD[13.5396] → [14.3103:3222]

B:BD[14.3222] → [14.3222:3223]

B:BD[13.5323] → [14.3090:3102]

use std::borrow::Cow;
use std::io::Write;
use std::sync::{Arc, Mutex};
pub struct Cursors {
    pub inner: Arc<Mutex<InnerCursors>>,
}
pub struct InnerCursors {
    drawn: usize,
    n_post: usize,
    n_pre: usize,
    w: usize,
    stop: bool,
}
impl Cursors {
    pub fn new() -> Self {
        let inner = Arc::new(Mutex::new(InnerCursors {
            drawn: 0,
            cursors: Vec::new(),
            n_post: 0,
            n_pre: 0,
            stop: false,
            w: 0,
        }));
            {
                let mut inner = if let Ok(inner) = inner_.lock() {
                    inner
                } else {
                    break;
                };
                if inner.stop {
                    inner.render().unwrap();
                    break;
                } else {
                    inner.render().unwrap();
                }
            }
            std::thread::sleep(std::time::Duration::from_millis(100));
    }
    pub fn stop(&self) {
        if let Ok(mut n) = self.inner.lock() {
            n.stop = true
        }
    }
        self.stop();
    }
    pub fn borrow_mut(
        &self,
    ) -> Result<
        std::sync::MutexGuard<InnerCursors>,
        std::sync::PoisonError<std::sync::MutexGuard<'_, InnerCursors>>,
    > {
        let mut m = self.inner.lock()?;
        m.n_pre = 0;
        Ok(m)
    }
}
#[allow(dead_code)]
pub enum Cursor {
    Static {
        pre: Cow<'static, str>,
    },
    Bar {
        pre: Cow<'static, str>,
        n: usize,
        i: usize,
    },
    Spin {
        pre: Cow<'static, str>,
        i: usize,
    },
}
impl Cursor {
    fn pre(&self) -> &str {
        match self {
            Cursor::Static { pre } => pre,
            Cursor::Bar { pre, .. } => pre,
            Cursor::Spin { pre, .. } => pre,
        }
    }
    fn n(&self) -> usize {
        match self {
            Cursor::Bar { n, .. } => {
                let mut n = *n;
                let mut r = 6;
                while n > 0 {
                    n /= 10;
                    r += 2
                }
                r
            }
            _ => 0,
        }
    }
    pub fn incr(&mut self) {
        match self {
            Cursor::Bar { i, .. } => *i += 1,
            _ => {}
        }
    }
    fn render<W: std::io::Write>(
        &mut self,
        stdout: &mut W,
        npre: usize,
        npost: usize,
        w: usize,
    ) -> Result<(), std::io::Error> {
        match self {
            Cursor::Static { pre } => {
                for _ in 0..npre - pre.chars().count() {
                    stdout.write_all(b" ")?;
                }
                stdout.write_all(pre.as_bytes())?;
                // Fil the rest of the line with spaces.
                for _ in 0..w - npre {
                    stdout.write_all(b" ")?;
                }
                Ok(())
            }
            Cursor::Bar { pre, i, n } => {
                for _ in 0..npre - pre.chars().count() {
                    stdout.write_all(b" ")?;
                }
                // Comupte the appropriate width for the bar.
                // Output the bar.
                write!(stdout, "{} [", pre)?;
                let wb = (w as usize).min(50);
                    }
                }
                write!(stdout, "] {}/{}", *i, *n)?;
                for _ in 0..nw {
                    stdout.write_all(b" ")?;
                }
                Ok(())
            }
            Cursor::Spin { pre, i } => {
                for _ in 0..npre - pre.chars().count() {
                    stdout.write_all(b" ")?;
                }
                stdout.write_all(pre.as_bytes())?;
                stdout.write_all(b" ")?;
                const SYM: [&str; 8] = ["←", "↖", "↑", "↗", "→", "↘", "↓", "↙"];
                stdout.write_all(SYM[*i].as_bytes())?;
                *i = (*i + 1) % SYM.len();
                // Fill the rest of the line with spaces.
                for _ in 0..w - npre - 2 {
                    stdout.write_all(b" ")?;
                }
                Ok(())
            }
        }
    }
impl InnerCursors {
    fn render(&mut self) -> Result<(), std::io::Error> {
        use terminal_size::*;
        let mut stdout = std::io::stdout();
        if let Some((Width(w), _)) = terminal_size() {
            if self.n_pre == 0 {
                self.n_post = 0;
                for c in self.cursors.iter() {
                    let n_pre = c.pre().chars().count();
                    self.n_pre = self.n_pre.max(n_pre);
                    self.n_post = self.n_post.max(c.n());
                }
            }
                stdout.write_all(b"\x1B[F")?;
            }
            for c in self.cursors.iter_mut() {
                // Clear the end of the line and move to the next one.
                stdout.write_all(b"\x1B[K\n")?;
            }
            self.drawn = self.cursors.len();
            // Erase the terminal after the cursor.
            stdout.write_all(b"\x1B[J")?;
            stdout.flush()?;
        }
        Ok(())
    }
}
                c.render(&mut stdout, self.n_pre, self.n_post, w)?;
            self.w = w;
            let w = w as usize;
            for _ in 0..self.drawn {
    pub fn push(&mut self, c: Cursor) -> usize {
        let r = self.cursors.len();
        self.cursors.push(c);
        r
    }
}
                let nw = w + npost - wb - 6;
                if *n <= 1 {
                    for _ in 0..wb as usize {
                    }
                } else {
                    for j in 0..wb as usize {
                        if j < k {
                            write!(stdout, "=")?;
                        } else if j == k {
                            write!(stdout, ">")?;
                        } else {
                            write!(stdout, " ")?
                        }
                    let k = (wb as usize * *i) / *n;
                        stdout.write_all(filler.as_bytes())?;
                    let filler = if *i == *n { "=" } else { " " };
                let w_digits = {
                    let mut n = *n;
                    let mut nd = if n == 0 { 1 } else { 0 } + if *i == 0 { 1 } else { 0 };
                    while n > 0 {
                        n /= 10;
                        nd += 1
                    }
                };
                let w = w - npre - npost - w_digits;
                    nd * 2
            _ => {}
        }
    }
    pub fn incr_len(&mut self) {
        match self {
            Cursor::Bar { n, .. } => *n += 1,
        m.stop = false;
        debug!("borrow_mut");
        self.restart();
        let mut t = self.t.lock().unwrap();
        if let Some(t) = t.take() {
            t.join().unwrap();
        }
    pub fn join(&self) {
        debug!("join");
        debug!("stop");
        }));
        let cursors = Cursors {
            inner,
            t: Mutex::new(None),
        };
        cursors.restart();
        cursors
    }
    fn restart(&self) {
        debug!("restart");
        let mut t = self.t.lock().unwrap();
        if t.is_some() {
            return;
        }
        let inner_ = self.inner.clone();
        *t = Some(std::thread::spawn(move || loop {
}
impl std::ops::Index<usize> for InnerCursors {
    type Output = Cursor;
    fn index(&self, i: usize) -> &Self::Output {
        self.cursors.index(i)
    }
}
impl std::ops::IndexMut<usize> for InnerCursors {
    fn index_mut(&mut self, i: usize) -> &mut Self::Output {
        self.cursors.index_mut(i)
    }
    cursors: Vec<Cursor>,
    t: Mutex<Option<std::thread::JoinHandle<()>>>,
lazy_static::lazy_static! {
    pub static ref PROGRESS: crate::progress::Cursors = crate::progress::Cursors::new();
}
use log::*;

Insertion in pijul/src/remote/ssh.rs at line 15 [12.25380]
[18.44]
[19.276]
```
use pijul_term::progress::ProgressBar;
```
Replacement in pijul/src/remote/ssh.rs at line 949 [12.25380]
B:BD[12.44372] → [20.0:22]
```
        pro_n: usize,
```
[12.44372]
[12.44372]
```
        progress: ProgressBar,
```
Replacement in pijul/src/remote/ssh.rs at line 995 [12.25380]
∅:D[21.3688] → [20.23:88]
B:BD[12.45379] → [20.23:88]
```
            super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
```
[21.3688]
[22.780]
```
            progress.inc(1);
```
Replacement in pijul/src/remote/ssh.rs at line 1002 [12.25380]
B:BD[12.45470] → [14.0:22]
```
        pro_n: usize,
```
[12.45470]
[21.3689]
```
        progress: ProgressBar,
```

Replacement in pijul/src/remote/ssh.rs at line 1008 [12.25380]

B:BD[12.45564] → [14.23:97]

        self.download_changes_(pro_n, c, Some(sender), changes_dir, full)

[12.45564]

[23.131]

        self.download_changes_(progress, c, Some(sender), changes_dir, full)

Replacement in pijul/src/remote/ssh.rs at line 1014 [12.25380]
B:BD[23.208] → [14.98:120]
```
        pro_n: usize,
```
[23.208]
[21.3800]
```
        progress: ProgressBar,
```

Replacement in pijul/src/remote/ssh.rs at line 1038 [12.25380]

B:BD[13.738] → [14.121:190]

                super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();

[13.738]

[13.798]

                progress.inc(1);

Insertion in pijul/src/remote/mod.rs at line 2 [12.52474]
[24.884]
[19.406]
```
use std::convert::TryInto;
```
Insertion in pijul/src/remote/mod.rs at line 18 [12.52474]
[19.483]
[12.52711]
```
use pijul_term::progress::*;
```
Deletion in pijul/src/remote/mod.rs at line 29 [12.52474]
B:BD[14.344] → [14.344:375]
∅:D[14.375] → [25.10383:10384]
B:BD[25.10383] → [25.10383:10384]
```
use crate::progress::PROGRESS;
```

Replacement in pijul/src/remote/mod.rs at line 1047 [12.52474]

B:BD[12.65324] → [20.89:352]

        let pro_n = {
            let mut pro = PROGRESS.borrow_mut().unwrap();
            pro.push(crate::progress::Cursor::Bar {
                i: 0,
                n: changes.len(),
                pre: "Uploading changes".into(),
            })
        };

[12.65324]

[20.352]

        let upload_progress = ProgressBar::new(changes.len().try_into()?, UPLOAD_MESSAGE)?;

Replacement in pijul/src/remote/mod.rs at line 1050 [12.52474]

B:BD[12.65345] → [20.354:452]

            RemoteRepo::Local(ref mut l) => l.upload_changes(pro_n, local, to_channel, changes)?,

[12.65345]

[20.452]

            RemoteRepo::Local(ref mut l) => {
                l.upload_changes(upload_progress.clone(), local, to_channel, changes)?
            }

Replacement in pijul/src/remote/mod.rs at line 1054 [12.52474]

B:BD[20.496] → [20.496:571]

                s.upload_changes(pro_n, local, to_channel, changes).await?

[20.496]

[20.571]

                s.upload_changes(upload_progress.clone(), local, to_channel, changes)
                    .await?
            }
            RemoteRepo::Http(ref h) => {
                h.upload_changes(upload_progress.clone(), local, to_channel, changes)
                    .await?

Deletion in pijul/src/remote/mod.rs at line 1061 [12.52474]

B:BD[20.585] → [20.585:684]

            RemoteRepo::Http(ref h) => h.upload_changes(pro_n, local, to_channel, changes).await?,

Replacement in pijul/src/remote/mod.rs at line 1067 [12.52474]

∅:D[26.1023] → [20.685:767]

B:BD[27.2665] → [20.685:767]

                local::upload_changes(pro_n, &store, txn, &mut channel, changes)?

[26.1023]

[27.2745]

                local::upload_changes(upload_progress.clone(), &store, txn, &mut channel, changes)?

Replacement in pijul/src/remote/mod.rs at line 1071 [12.52474]
B:BD[12.66580] → [20.768:793]
```
        PROGRESS.join();
```
[12.66580]
[20.793]
```
        upload_progress.finish();
```
Replacement in pijul/src/remote/mod.rs at line 1078 [12.52474]
B:BD[12.66710] → [14.376:398]
```
        pro_n: usize,
```
[12.66710]
[21.15968]
```
        progress: ProgressBar,
```

Replacement in pijul/src/remote/mod.rs at line 1086 [12.52474]

B:BD[12.67232] → [14.399:497]

            RemoteRepo::Local(ref mut l) => l.download_changes(pro_n, hashes, send, path).await?,

[12.67232]

[13.1807]

            RemoteRepo::Local(ref mut l) => {
                l.download_changes(progress, hashes, send, path).await?
            }

Replacement in pijul/src/remote/mod.rs at line 1090 [12.52474]

B:BD[13.1851] → [14.498:573]

                s.download_changes(pro_n, hashes, send, path, full).await?

[13.1851]

[13.1950]

                s.download_changes(progress, hashes, send, path, full)
                    .await?

Replacement in pijul/src/remote/mod.rs at line 1094 [12.52474]

B:BD[13.2009] → [14.574:649]

                h.download_changes(pro_n, hashes, send, path, full).await?

[13.2009]

[13.2108]

                h.download_changes(progress, hashes, send, path, full)
                    .await?

Replacement in pijul/src/remote/mod.rs at line 1142 [12.52474]

∅:D[21.16150] → [14.711:1024]

B:BD[24.1407] → [14.711:1024]

∅:D[15.105] → [13.2307:2364]

∅:D[14.1024] → [13.2307:2364]

B:BD[13.2307] → [13.2307:2364]

B:BD[13.2364] → [14.1025:1081]

        let mut pro = PROGRESS.borrow_mut().unwrap();
        let pro_a = pro.push(crate::progress::Cursor::Bar {
            i: 0,
            n: to_apply.len(),
            pre: "Downloading changes".into(),
        });
        let pro_b = if do_apply {
            Some(pro.push(crate::progress::Cursor::Bar {
                i: 0,
                n: to_apply.len(),
                pre: "Applying".into(),
            }))

[21.16150]

[14.1081]

        let apply_len = to_apply.len().try_into()?;
        let download_progress = ProgressBar::new(apply_len, DOWNLOAD_MESSAGE)?;
        let apply_progress = if do_apply {
            ProgressBar::new(apply_len, APPLY_MESSAGE)?

Replacement in pijul/src/remote/mod.rs at line 1147 [12.52474]
B:BD[14.1098] → [14.1098:1115]
```
            None
```
[14.1098]
[14.1115]
```
            ProgressBar::hidden()
```
Deletion in pijul/src/remote/mod.rs at line 1149 [12.52474]
B:BD[14.1126] → [14.1126:1155]
```
        std::mem::drop(pro);
```
Insertion in pijul/src/remote/mod.rs at line 1157 [12.52474]
[28.1472]
[28.1472]
```
        let cloned_download_progress = download_progress.clone();
```

Replacement in pijul/src/remote/mod.rs at line 1160 [12.52474]

B:BD[28.1532] → [14.1156:1250]

                .download_changes(pro_a, &mut hash_recv, &mut send, &mut change_path_, false)

[28.1532]

[28.1619]

                .download_changes(
                    cloned_download_progress,
                    &mut hash_recv,
                    &mut send,
                    &mut change_path_,
                    false,
                )

Insertion in pijul/src/remote/mod.rs at line 1168 [12.52474]
[28.1644]
[28.1644]

Replacement in pijul/src/remote/mod.rs at line 1194 [12.52474]

B:BD[29.200] → [30.72:164]

            .download_changes_rec(repo, hash_send, recv, send_ready, pro_a, waiting, asked)

[29.200]

[31.237]

            .download_changes_rec(
                repo,
                hash_send,
                recv,
                send_ready,
                download_progress.clone(),
                waiting,
                asked,
            )

Replacement in pijul/src/remote/mod.rs at line 1241 [12.52474]

B:BD[24.2529] → [14.1251:1292]

            if let Some(pro_b) = pro_b {

[24.2529]

[32.972]

            if let Some(apply_progress) = apply_progress.inner() {

Replacement in pijul/src/remote/mod.rs at line 1243 [12.52474]

B:BD[32.1015] → [14.1293:1355]

                PROGRESS.inner.lock().unwrap()[pro_b].incr();

[32.1015]

[13.3567]

                apply_progress.inc(1);

Replacement in pijul/src/remote/mod.rs at line 1259 [12.52474]
∅:D[31.588] → [14.1356:1405]
∅:D[33.7990] → [14.1356:1405]
B:BD[34.321] → [14.1356:1405]
```
        debug!("join");
        PROGRESS.join();
```
[31.588]
[24.2530]
```
        download_progress.finish();
        apply_progress.finish();
```
Replacement in pijul/src/remote/mod.rs at line 1271 [12.52474]
∅:D[29.392] → [31.800:822]
B:BD[31.800] → [31.800:822]
```
        pro_n: usize,
```
[29.392]
[31.822]
```
        progress: ProgressBar,
```

Replacement in pijul/src/remote/mod.rs at line 1302 [12.52474]

B:BD[30.326] → [8.0:86]

                                    PROGRESS.borrow_mut().unwrap()[pro_n].incr_len();

[30.326]

                                    if let Some(progress) = progress.inner() {
                                        progress.inc_length(1);
                                    }

Replacement in pijul/src/remote/mod.rs at line 1345 [12.52474]

B:BD[12.71386] → [14.1472:1733]

        let pro_n = {
            let mut pro = PROGRESS.borrow_mut().unwrap();
            pro.push(crate::progress::Cursor::Bar {
                i: 0,
                n: tag.len(),
                pre: "Downloading changes".into(),
            })
        };

[12.71386]

[31.3389]

        let download_progress = ProgressBar::new(tag.len().try_into()?, DOWNLOAD_MESSAGE)?;
        let cloned_download_progress = download_progress.clone();

Replacement in pijul/src/remote/mod.rs at line 1351 [12.52474]

B:BD[13.3866] → [14.1735:1762]

                    pro_n,

[13.3866]

[13.3910]

                    cloned_download_progress,

Replacement in pijul/src/remote/mod.rs at line 1377 [12.52474]
B:BD[9.500] → [9.500:523]
```
                pro_n,
```
[9.500]
[9.523]
```
                download_progress.clone(),
```
Insertion in pijul/src/remote/mod.rs at line 1399 [12.52474]
[14.1960]
[12.73007]
```
        download_progress.finish();
```

Replacement in pijul/src/remote/mod.rs at line 1454 [12.52474]

B:BD[12.75363] → [14.2118:2410]

∅:D[14.2410] → [12.75363:75405]

∅:D[13.4279] → [12.75363:75405]

B:BD[12.75363] → [12.75363:75405]

B:BD[12.75405] → [28.2108:2126]

B:BD[28.2126] → [14.2411:2507]

∅:D[14.2507] → [28.2215:2282]

∅:D[13.4512] → [28.2215:2282]

B:BD[28.2215] → [28.2215:2282]

∅:D[28.2282] → [12.76064:76076]

B:BD[12.76064] → [12.76064:76076]

        let mut progress = PROGRESS.borrow_mut().unwrap();
        let pro_n = {
            progress.push(crate::progress::Cursor::Bar {
                i: 0,
                n: 0,
                pre: "Completing changes".into(),
            })
        };
        std::mem::drop(progress);
        let t = tokio::spawn(async move {
            self_
                .download_changes(pro_n, &mut recv_hash, &mut send_sig, &mut changes_dir, true)
                .await?;
            Ok::<_, anyhow::Error>(self_)
        });

[12.75363]

[12.76076]


        let dummy_progress = ProgressBar::hidden();
        let completion_spinner = Spinner::new(COMPLETE_MESSAGE)?;
        let t: tokio::task::JoinHandle<Result<RemoteRepo, anyhow::Error>> =
            tokio::spawn(async move {
                self_
                    .download_changes(
                        dummy_progress,
                        &mut recv_hash,
                        &mut send_sig,
                        &mut changes_dir,
                        true,
                    )
                    .await?;
                Ok::<_, anyhow::Error>(self_)
            });

Deletion in pijul/src/remote/mod.rs at line 1484 [12.52474]
∅:D[21.18716] → [14.2508:2574]
B:BD[13.4550] → [14.2508:2574]
```
                PROGRESS.borrow_mut().unwrap()[pro_n].incr_len();
```
Deletion in pijul/src/remote/mod.rs at line 1507 [12.52474]
∅:D[21.18770] → [14.2575:2645]
B:BD[13.4592] → [14.2575:2645]
```
                    PROGRESS.borrow_mut().unwrap()[pro_n].incr_len();
```
Replacement in pijul/src/remote/mod.rs at line 1515 [12.52474]
B:BD[12.77704] → [14.2646:2671]
```
        PROGRESS.join();
```
[12.77704]
[12.77704]
```
        completion_spinner.finish()?;
```
Insertion in pijul/src/remote/local.rs at line 9 [12.79745]
[19.552]
[21.20382]
```
use pijul_term::progress::ProgressBar;
```
Replacement in pijul/src/remote/local.rs at line 142 [12.79745]
B:BD[12.82143] → [20.809:831]
```
        pro_n: usize,
```
[12.82143]
[12.82143]
```
        progress: ProgressBar,
```

Replacement in pijul/src/remote/local.rs at line 178 [12.79745]

B:BD[35.1124] → [20.832:910]

        upload_changes(pro_n, &store, &mut *txn.write(), &channel, changes)?;

[35.1124]

[35.1204]

        upload_changes(progress, &store, &mut *txn.write(), &channel, changes)?;

Replacement in pijul/src/remote/local.rs at line 196 [12.79745]
B:BD[12.83512] → [14.2838:2860]
```
        pro_n: usize,
```
[12.83512]
[21.22266]
```
        progress: ProgressBar,
```

Replacement in pijul/src/remote/local.rs at line 212 [12.79745]

B:BD[36.1080] → [36.1080:1145]

            super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();

[36.1080]

[36.1145]

            progress.inc(1);

Replacement in pijul/src/remote/local.rs at line 267 [12.79745]
∅:D[37.5094] → [20.911:929]
B:BD[38.1047] → [20.911:929]
```
    pro_n: usize,
```
[37.5094]
[27.3885]
```
    progress: ProgressBar,
```
Replacement in pijul/src/remote/local.rs at line 293 [12.79745]
∅:D[21.23926] → [20.930:991]
B:BD[39.508] → [20.930:991]
```
        super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
```
[21.23926]
[27.4175]
```
        progress.inc(1);
```
Insertion in pijul/src/remote/http.rs at line 5 [42.10]
[40.32]
[41.1881]
```
use pijul_term::progress::ProgressBar;
```

Replacement in pijul/src/remote/http.rs at line 42 [42.10]

B:BD[21.24470] → [43.557:628]

    tokio::fs::create_dir_all(&path.parent().unwrap()).await.unwrap();

[21.24470]

[44.314]

    tokio::fs::create_dir_all(&path.parent().unwrap())
        .await
        .unwrap();

Replacement in pijul/src/remote/http.rs at line 149 [42.10]
B:BD[38.1135] → [14.2927:2949]
```
        pro_n: usize,
```
[38.1135]
[21.24723]
```
        progress: ProgressBar,
```
Replacement in pijul/src/remote/http.rs at line 164 [42.10]
∅:D[30.1261] → [14.2950:3019]
B:BD[13.5078] → [14.2950:3019]
```
                super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
```
[30.1261]
[30.1262]
```
                progress.inc(1);
```
Replacement in pijul/src/remote/http.rs at line 170 [42.10]
B:BD[30.1410] → [30.1410:1435]
```
                continue
```
[30.1410]
[30.1435]
```
                continue;
```
Replacement in pijul/src/remote/http.rs at line 176 [42.10]
B:BD[30.1626] → [30.1626:1652]
```
                    break
```
[30.1626]
[30.1652]
```
                    break;
```

Replacement in pijul/src/remote/http.rs at line 213 [42.10]

B:BD[30.3073] → [30.3073:3150]

                        super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();

[30.3073]

[30.3150]

                        progress.inc(1);

Replacement in pijul/src/remote/http.rs at line 227 [42.10]
B:BD[45.876] → [20.992:1014]
```
        pro_n: usize,
```
[45.876]
[45.876]
```
        progress: ProgressBar,
```

Replacement in pijul/src/remote/http.rs at line 292 [42.10]

B:BD[45.1908] → [20.1015:1080]

            super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();

[46.597]

[32.1501]

            progress.inc(1);

Replacement in pijul/src/remote/http.rs at line 544 [42.10]

B:BD[43.1930] → [43.1930:2044]

    pub async fn prove(
        &mut self,
        key: libpijul::key::SKey,
    ) -> Result<(), anyhow::Error> {

[43.1930]

[43.2044]

    pub async fn prove(&mut self, key: libpijul::key::SKey) -> Result<(), anyhow::Error> {

Deletion in pijul/src/main.rs at line 4 [12.83981]
∅:D[47.14] → [13.11606:11620]
B:BD[12.84234] → [13.11606:11620]
```
mod progress;
```

Insertion in pijul/src/config.rs at line 323 [12.89866]

[48.539]

pub fn color_choice() -> Choice {
    if let Ok(config) = Global::load() {
        config.0.colors.unwrap_or_default()
    } else {
        Choice::Auto
    }
}

Insertion in pijul/src/config.rs at line 332 [12.89866]
[48.599]
[48.599]
```
// TODO: this doesn't need to be wrapped in Result
```

Replacement in pijul/src/config.rs at line 334 [12.89866]

B:BD[48.669] → [48.669:1039]

    if let Ok((config, _)) = Global::load() {
        let color_choice = config.colors.unwrap_or_default();
        match color_choice {
            Choice::Auto | Choice::Always => Ok(Box::new(theme::ColorfulTheme::default())),
            Choice::Never => Ok(Box::new(theme::SimpleTheme)),
        }
    } else {
        Ok(Box::new(theme::ColorfulTheme::default()))

[48.669]

[10.33]

    match color_choice() {
        Choice::Auto | Choice::Always => Ok(Box::new(theme::ColorfulTheme::default())),
        Choice::Never => Ok(Box::new(theme::SimpleTheme)),

Deletion in pijul/src/commands/reset.rs at line 11 [12.97650]
B:BD[19.1348] → [14.4148:4179]
```
use crate::progress::PROGRESS;
```
Insertion in pijul/src/commands/reset.rs at line 12 [12.97650]
[19.1383]
[12.97798]
```
use pijul_term::progress::{Spinner, OUTPUT_MESSAGE};
```

Replacement in pijul/src/commands/reset.rs at line 192 [12.97650]

∅:D[4.261] → [35.10304:10538]

B:BD[35.10304] → [35.10304:10538]

            PROGRESS
                .borrow_mut()
                .unwrap()
                .push(crate::progress::Cursor::Spin {
                    i: 0,
                    pre: "Outputting repository".into(),
                });

[4.261]

[35.10538]

            let output_spinner = Spinner::new(OUTPUT_MESSAGE)?;

Replacement in pijul/src/commands/reset.rs at line 217 [12.97650]
∅:D[5.68] → [35.11406:11435]
B:BD[35.11406] → [35.11406:11435]
```
            PROGRESS.join();
```
[5.68]
[35.11435]
```
            output_spinner.finish()?;
```

Replacement in pijul/src/commands/reset.rs at line 219 [12.97650]

B:BD[35.11452] → [35.11452:11686]

            PROGRESS
                .borrow_mut()
                .unwrap()
                .push(crate::progress::Cursor::Spin {
                    i: 0,
                    pre: "Outputting repository".into(),
                });

[35.11452]

[35.11686]

            let output_spinner = Spinner::new(OUTPUT_MESSAGE)?;

Replacement in pijul/src/commands/reset.rs at line 240 [12.97650]
B:BD[12.101687] → [35.12218:12247]
```
            PROGRESS.join();
```
[12.101687]
[12.101713]
```
            output_spinner.finish()?;
```
Insertion in pijul/src/commands/pushpull.rs at line 2 [12.111631]
[49.43]
[19.1651]
```
use std::convert::TryInto;
```
Deletion in pijul/src/commands/pushpull.rs at line 16 [12.111631]
∅:D[50.2430] → [14.4774:4805]
B:BD[19.1761] → [14.4774:4805]
```
use crate::progress::PROGRESS;
```
Insertion in pijul/src/commands/pushpull.rs at line 18 [12.111631]
[19.1796]
[12.111878]
```
use pijul_term::progress::{ProgressBar, Spinner, APPLY_MESSAGE, OUTPUT_MESSAGE};
```

Replacement in pijul/src/commands/pushpull.rs at line 457 [12.111631]

B:BD[51.11788] → [52.0:267]

            let mut pro = PROGRESS.borrow_mut().unwrap();
            let n = pro.push(crate::progress::Cursor::Bar {
                i: 0,
                n: to_download.len(),
                pre: "Applying".into(),
            });
            std::mem::drop(pro);

[51.11788]

[53.10186]

            let apply_progress = ProgressBar::new(to_download.len().try_into()?, APPLY_MESSAGE)?;

Replacement in pijul/src/commands/pushpull.rs at line 477 [12.111631]
∅:D[21.29393] → [52.268:325]
B:BD[51.11872] → [52.268:325]
```
                PROGRESS.borrow_mut().unwrap()[n].incr()
```
[21.29393]
[12.120565]
```
                apply_progress.inc(1);
```
Insertion in pijul/src/commands/pushpull.rs at line 479 [12.111631]
[12.120579]
[12.120579]
```
            apply_progress.finish();
```

Replacement in pijul/src/commands/pushpull.rs at line 539 [12.111631]

∅:D[7.47] → [14.4806:5040]

∅:D[49.184] → [14.4806:5040]

B:BD[54.1366] → [14.4806:5040]

            PROGRESS
                .borrow_mut()
                .unwrap()
                .push(crate::progress::Cursor::Spin {
                    i: 0,
                    pre: "Outputting repository".into(),
                });

[7.47]

[35.16494]

            let output_spinner = Spinner::new(OUTPUT_MESSAGE)?;

Replacement in pijul/src/commands/pushpull.rs at line 571 [12.111631]
B:BD[55.679] → [14.5041:5070]
```
            PROGRESS.join();
```
[55.679]
[56.1539]
```
            output_spinner.finish()?;
```
Deletion in pijul/src/commands/apply.rs at line 10 [12.194289]
B:BD[19.3380] → [14.5073:5104]
```
use crate::progress::PROGRESS;
```
Insertion in pijul/src/commands/apply.rs at line 11 [12.194289]
[19.3415]
[12.194497]
```
use pijul_term::progress::{Spinner, OUTPUT_MESSAGE};
```

Replacement in pijul/src/commands/apply.rs at line 147 [12.194289]

∅:D[35.23910] → [14.5105:5339]

B:BD[54.3383] → [14.5105:5339]

B:BD[14.5339] → [57.175:176]

            PROGRESS
                .borrow_mut()
                .unwrap()
                .push(crate::progress::Cursor::Spin {
                    i: 0,
                    pre: "Outputting repository".into(),
                });

[35.23910]

[57.176]

            let output_spinner = Spinner::new(OUTPUT_MESSAGE)?;

Replacement in pijul/src/commands/apply.rs at line 218 [12.194289]
B:BD[58.1642] → [14.5340:5369]
```
            PROGRESS.join();
```
[58.1642]
[56.4139]
```
            output_spinner.finish()?;
```
Insertion in pijul/Cargo.toml at line 111 [12.196374]
[59.1406]
[60.309]
```
pijul-term = { path = "../pijul-term" }
```

Replacement in Cargo.toml at line 2 [12.1030188]

B:BD[12.1030201] → [61.230:280]

members = [ "pijul-macros", "pijul", "libpijul" ]

[12.1030201]

[62.315972]

members = [ "pijul-macros", "pijul", "libpijul", "pijul-term" ]

Insertion in Cargo.lock at line 135 [64.35]
[63.542]
[64.1890]
```
dependencies = [
 "backtrace",
]
```

Insertion in Cargo.lock at line 1462 [64.35]

[59.4554]

name = "indicatif"
version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
dependencies = [
 "console",
 "instant",
 "number_prefix",
 "portable-atomic",
 "unicode-segmentation",
 "unicode-width",
]
[[package]]

Insertion in Cargo.lock at line 1988 [64.35]

[64.43389]


[[package]]
name = "number_prefix"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

Insertion in Cargo.lock at line 2231 [64.35]
[59.7238]
[64.48476]
```
 "pijul-term",
```
Deletion in Cargo.lock at line 2261 [64.35]
B:BD[64.48854] → [64.48854:48864]
```
 "regex",
```

Insertion in Cargo.lock at line 2262 [64.35]

[59.7270]

[64.48872]

]
[[package]]
name = "pijul-term"
version = "0.0.1"
dependencies = [
 "anyhow",
 "indicatif",
 "lazy_static 1.4.0",

Insertion in Cargo.lock at line 2308 [64.35]

[64.49803]

name = "portable-atomic"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
[[package]]

Insertion in Cargo.lock at line 3257 [64.35]

[64.72360]

name = "unicode-segmentation"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]

Refactor `progress` module into its own crate

Dependencies

In discussions

Change contents

File addition: pijul-term (d--x------)

File addition: src (d--x------)

File addition: progress.rs (----------)

File addition: lib.rs (----------)

File addition: Cargo.toml (----------)

File deletion: progress.rs

Insertion in pijul/src/remote/ssh.rs at line 15 [12.25380]

Replacement in pijul/src/remote/ssh.rs at line 949 [12.25380]

Replacement in pijul/src/remote/ssh.rs at line 995 [12.25380]

Replacement in pijul/src/remote/ssh.rs at line 1002 [12.25380]

Replacement in pijul/src/remote/ssh.rs at line 1008 [12.25380]

Replacement in pijul/src/remote/ssh.rs at line 1014 [12.25380]

Replacement in pijul/src/remote/ssh.rs at line 1038 [12.25380]

Insertion in pijul/src/remote/mod.rs at line 2 [12.52474]

Insertion in pijul/src/remote/mod.rs at line 18 [12.52474]

Deletion in pijul/src/remote/mod.rs at line 29 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1047 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1050 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1054 [12.52474]

Deletion in pijul/src/remote/mod.rs at line 1061 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1067 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1071 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1078 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1086 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1090 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1094 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1142 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1147 [12.52474]

Deletion in pijul/src/remote/mod.rs at line 1149 [12.52474]

Insertion in pijul/src/remote/mod.rs at line 1157 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1160 [12.52474]

Insertion in pijul/src/remote/mod.rs at line 1168 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1194 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1241 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1243 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1259 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1271 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1302 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1345 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1351 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1377 [12.52474]

Insertion in pijul/src/remote/mod.rs at line 1399 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1454 [12.52474]

Deletion in pijul/src/remote/mod.rs at line 1484 [12.52474]

Deletion in pijul/src/remote/mod.rs at line 1507 [12.52474]

Replacement in pijul/src/remote/mod.rs at line 1515 [12.52474]

Insertion in pijul/src/remote/local.rs at line 9 [12.79745]

Replacement in pijul/src/remote/local.rs at line 142 [12.79745]

Replacement in pijul/src/remote/local.rs at line 178 [12.79745]

Replacement in pijul/src/remote/local.rs at line 196 [12.79745]

Replacement in pijul/src/remote/local.rs at line 212 [12.79745]

Replacement in pijul/src/remote/local.rs at line 267 [12.79745]

Replacement in pijul/src/remote/local.rs at line 293 [12.79745]

Insertion in pijul/src/remote/http.rs at line 5 [42.10]

Replacement in pijul/src/remote/http.rs at line 42 [42.10]

Replacement in pijul/src/remote/http.rs at line 149 [42.10]

Replacement in pijul/src/remote/http.rs at line 164 [42.10]

Replacement in pijul/src/remote/http.rs at line 170 [42.10]

Replacement in pijul/src/remote/http.rs at line 176 [42.10]

Replacement in pijul/src/remote/http.rs at line 213 [42.10]

Replacement in pijul/src/remote/http.rs at line 227 [42.10]

Replacement in pijul/src/remote/http.rs at line 292 [42.10]

Replacement in pijul/src/remote/http.rs at line 544 [42.10]

Deletion in pijul/src/main.rs at line 4 [12.83981]

Insertion in pijul/src/config.rs at line 323 [12.89866]

Insertion in pijul/src/config.rs at line 332 [12.89866]

Replacement in pijul/src/config.rs at line 334 [12.89866]

Deletion in pijul/src/commands/reset.rs at line 11 [12.97650]

Insertion in pijul/src/commands/reset.rs at line 12 [12.97650]

Replacement in pijul/src/commands/reset.rs at line 192 [12.97650]

Replacement in pijul/src/commands/reset.rs at line 217 [12.97650]

Replacement in pijul/src/commands/reset.rs at line 219 [12.97650]

Replacement in pijul/src/commands/reset.rs at line 240 [12.97650]

Insertion in pijul/src/commands/pushpull.rs at line 2 [12.111631]

Deletion in pijul/src/commands/pushpull.rs at line 16 [12.111631]

Insertion in pijul/src/commands/pushpull.rs at line 18 [12.111631]