dblsaiko/pijul - Change JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC

Migrate from `pijul::progress` to `pijul_interaction::progress`

This change should make terminal interactions less error-prone, nicer looking and easier to maintain, but further polish is still needed, as many pre-existing issues regarding status output have not been fully resolved.

Created by finchie on July 13, 2023

JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC

Dependencies

In channels

main

Change contents

File deletion: progress.rs

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

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

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

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

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

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

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

B:BD[13.5494] → [13.5494:5541]

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

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

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

B:BD[13.5638] → [13.5638:5894]

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

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

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

B:BD[13.6476] → [13.6476: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:7823]

B:BD[13.6903] → [13.6903:7823]

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

B:BD[13.7823] → [13.7823:8691]

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

B:BD[13.8733] → [13.8733: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:10451]

B:BD[13.9630] → [13.9630: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:11605]

B:BD[13.11271] → [13.11271: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:1561]

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: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:3664]

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

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

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

B:BD[13.5396] → [14.3103: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 21 [12.25380]
[18.23]
[19.384]
```
use pijul_interaction::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_bar: ProgressBar,
```
Replacement in pijul/src/remote/ssh.rs at line 995 [12.25380]
∅:D[18.3688] → [20.23:88]
B:BD[12.45379] → [20.23:88]
```
            super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
```
[18.3688]
[21.780]
```
            progress_bar.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]
[18.3689]
```
        progress_bar: 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]

[22.131]

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

Replacement in pijul/src/remote/ssh.rs at line 1014 [12.25380]
B:BD[22.208] → [14.98:120]
```
        pro_n: usize,
```
[22.208]
[18.3800]
```
        progress_bar: 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_bar.inc(1);

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

B:BD[14.344] → [14.344:375]

use crate::progress::PROGRESS;

[14.344]

[23.10383]

use pijul_interaction::progress::{
    ProgressBar, Spinner, APPLY_MESSAGE, COMPLETE_MESSAGE, DOWNLOAD_MESSAGE, UPLOAD_MESSAGE,
};

Replacement in pijul/src/remote/mod.rs at line 1049 [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_bar = ProgressBar::new(changes.len() as u64, UPLOAD_MESSAGE)?;

Replacement in pijul/src/remote/mod.rs at line 1052 [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_bar, local, to_channel, changes)?
            }

Replacement in pijul/src/remote/mod.rs at line 1056 [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_bar, local, to_channel, changes)
                    .await?
            }
            RemoteRepo::Http(ref h) => {
                h.upload_changes(upload_bar, local, to_channel, changes)
                    .await?

Deletion in pijul/src/remote/mod.rs at line 1063 [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 1069 [12.52474]

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

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

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

[24.1023]

[25.2745]

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

Deletion in pijul/src/remote/mod.rs at line 1073 [12.52474]
B:BD[12.66580] → [20.768:793]
```
        PROGRESS.join();
```
Replacement in pijul/src/remote/mod.rs at line 1079 [12.52474]
B:BD[12.66710] → [14.376:398]
```
        pro_n: usize,
```
[12.66710]
[18.15968]
```
        progress_bar: ProgressBar,
```

Replacement in pijul/src/remote/mod.rs at line 1087 [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_bar, hashes, send, path).await?
            }

Replacement in pijul/src/remote/mod.rs at line 1091 [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_bar, hashes, send, path, full)
                    .await?

Replacement in pijul/src/remote/mod.rs at line 1095 [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_bar, hashes, send, path, full)
                    .await?

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

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

B:BD[26.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(),
            }))

[18.16150]

[14.1081]

        let apply_len = to_apply.len() as u64;
        let download_bar = ProgressBar::new(apply_len, DOWNLOAD_MESSAGE)?;
        let apply_bar = if do_apply {
            ProgressBar::new(apply_len, APPLY_MESSAGE)?

Replacement in pijul/src/remote/mod.rs at line 1152 [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 1154 [12.52474]
B:BD[14.1126] → [14.1126:1155]
```
        std::mem::drop(pro);
```
Insertion in pijul/src/remote/mod.rs at line 1162 [12.52474]
[27.1472]
[27.1472]
```
        let cloned_download_bar = download_bar.clone();
```

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

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

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

[27.1532]

[27.1619]

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

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

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

B:BD[28.200] → [29.72:164]

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

[28.200]

[30.237]

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

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

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

            if let Some(pro_b) = pro_b {

[26.2529]

[31.972]

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

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

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

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

[31.1015]

[13.3567]

                apply_bar.inc(1);

Deletion in pijul/src/remote/mod.rs at line 1264 [12.52474]
∅:D[30.588] → [14.1356:1405]
∅:D[32.7990] → [14.1356:1405]
B:BD[33.321] → [14.1356:1405]
```
        debug!("join");
        PROGRESS.join();
```
Replacement in pijul/src/remote/mod.rs at line 1273 [12.52474]
∅:D[28.392] → [30.800:822]
B:BD[30.800] → [30.800:822]
```
        pro_n: usize,
```
[28.392]
[30.822]
```
        progress_bar: ProgressBar,
```
Replacement in pijul/src/remote/mod.rs at line 1282 [12.52474]
B:BD[9.30] → [9.30:60]
```
                return Ok(())
```
[9.30]
[9.60]
```
                return Ok(());
```

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

B:BD[29.326] → [10.0:86]

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

[29.326]

                                    progress_bar.inc(1);

Deletion 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(),
            })
        };

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

[30.3446]

[12.71386]

        let download_bar = ProgressBar::new(tag.len() as u64, DOWNLOAD_MESSAGE)?;
        let cloned_download_bar = download_bar.clone();

Replacement in pijul/src/remote/mod.rs at line 1352 [12.52474]
B:BD[13.3866] → [14.1735:1762]
```
                    pro_n,
```
[13.3866]
[13.3910]
```
                    cloned_download_bar,
```

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

B:BD[28.593] → [29.604:703]

            .download_changes_rec(repo, send_hash, recv_signal, send_ready, pro_n, waiting, asked)

[28.593]

[30.3566]

            .download_changes_rec(
                repo,
                send_hash,
                recv_signal,
                send_ready,
                download_bar,
                waiting,
                asked,
            )

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] → [27.2108:2126]

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

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

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

B:BD[27.2215] → [27.2215:2282]

∅:D[27.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_bar = 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_bar,
                        &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[18.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[18.18770] → [14.2575:2645]
B:BD[13.4592] → [14.2575:2645]
```
                    PROGRESS.borrow_mut().unwrap()[pro_n].incr_len();
```
Deletion in pijul/src/remote/mod.rs at line 1515 [12.52474]
B:BD[12.77704] → [14.2646:2671]
```
        PROGRESS.join();
```
Insertion in pijul/src/remote/local.rs at line 11 [12.79745]
[18.20406]
[12.79900]
```
use pijul_interaction::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_bar: ProgressBar,
```

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

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

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

[34.1124]

[34.1204]

        upload_changes(progress_bar, &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]
[18.22266]
```
        progress_bar: ProgressBar,
```

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

B:BD[35.1080] → [35.1080:1145]

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

[35.1080]

[35.1145]

            progress_bar.inc(1);

Replacement in pijul/src/remote/local.rs at line 268 [12.79745]
∅:D[36.5094] → [20.911:929]
B:BD[37.1047] → [20.911:929]
```
    pro_n: usize,
```
[36.5094]
[25.3885]
```
    progress_bar: ProgressBar,
```
Replacement in pijul/src/remote/local.rs at line 294 [12.79745]
∅:D[18.23926] → [20.930:991]
B:BD[38.508] → [20.930:991]
```
        super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
```
[18.23926]
[25.4175]
```
        progress_bar.inc(1);
```
Insertion in pijul/src/remote/http.rs at line 10 [40.10]
[18.23952]
[39.0]
```
use pijul_interaction::progress::ProgressBar;
```

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

B:BD[18.24470] → [11.557:628]

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

[18.24470]

[41.314]

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

Replacement in pijul/src/remote/http.rs at line 147 [40.10]
B:BD[37.1135] → [14.2927:2949]
```
        pro_n: usize,
```
[37.1135]
[18.24723]
```
        progress_bar: ProgressBar,
```
Replacement in pijul/src/remote/http.rs at line 162 [40.10]
∅:D[29.1261] → [14.2950:3019]
B:BD[13.5078] → [14.2950:3019]
```
                super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
```
[29.1261]
[29.1262]
```
                progress_bar.inc(1);
```
Replacement in pijul/src/remote/http.rs at line 168 [40.10]
B:BD[29.1410] → [29.1410:1435]
```
                continue
```
[29.1410]
[29.1435]
```
                continue;
```
Replacement in pijul/src/remote/http.rs at line 174 [40.10]
B:BD[29.1626] → [29.1626:1652]
```
                    break
```
[29.1626]
[29.1652]
```
                    break;
```

Replacement in pijul/src/remote/http.rs at line 211 [40.10]

B:BD[29.3073] → [29.3073:3150]

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

[29.3073]

[29.3150]

                        progress_bar.inc(1);

Replacement in pijul/src/remote/http.rs at line 225 [40.10]
B:BD[42.876] → [20.992:1014]
```
        pro_n: usize,
```
[42.876]
[42.876]
```
        progress_bar: ProgressBar,
```

Replacement in pijul/src/remote/http.rs at line 290 [40.10]

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

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

[43.597]

[31.1501]

            progress_bar.inc(1);

Replacement in pijul/src/remote/http.rs at line 542 [40.10]

B:BD[11.1930] → [11.1930:2044]

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

[11.1930]

[11.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[44.14] → [13.11606:11620]
B:BD[12.84234] → [13.11606:11620]
```
mod progress;
```
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_interaction::progress::{Spinner, OUTPUT_MESSAGE};
```

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

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

B:BD[34.10304] → [34.10304:10538]

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

[4.261]

[34.10538]

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

Deletion in pijul/src/commands/reset.rs at line 217 [12.97650]
∅:D[5.68] → [34.11406:11435]
B:BD[34.11406] → [34.11406:11435]
```
            PROGRESS.join();
```

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

B:BD[34.11452] → [34.11452:11686]

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

[34.11452]

[34.11686]

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

Deletion in pijul/src/commands/reset.rs at line 239 [12.97650]
B:BD[12.101687] → [34.12218:12247]
```
            PROGRESS.join();
```
Deletion in pijul/src/commands/pushpull.rs at line 15 [12.111631]
∅:D[45.2430] → [14.4774:4805]
B:BD[19.1761] → [14.4774:4805]
```
use crate::progress::PROGRESS;
```

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

[19.1796]

[12.111878]

use pijul_interaction::progress::{ProgressBar, Spinner, APPLY_MESSAGE, OUTPUT_MESSAGE};

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

B:BD[46.11788] → [47.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);

[46.11788]

[48.10186]

            let apply_bar = ProgressBar::new(to_download.len() as u64, APPLY_MESSAGE)?;

Replacement in pijul/src/commands/pushpull.rs at line 477 [12.111631]
∅:D[18.29393] → [47.268:325]
B:BD[46.11872] → [47.268:325]
```
                PROGRESS.borrow_mut().unwrap()[n].incr()
```
[18.29393]
[12.120565]
```
                apply_bar.inc(1);
```

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

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

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

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

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

Insertion in pijul/src/commands/pushpull.rs at line 539 [12.111631]
[34.16538]
[50.1366]
```
            let _output_spinner = Spinner::new(OUTPUT_MESSAGE);
```

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

B:BD[8.411] → [8.411:452]

                                continue

[8.411]

[8.452]

                                continue;

Replacement in pijul/src/commands/pushpull.rs at line 551 [12.111631]
B:BD[8.508] → [8.508:531]
```
                    },
```
[8.508]
[49.294]
```
                    }
```
Deletion in pijul/src/commands/pushpull.rs at line 571 [12.111631]
B:BD[51.679] → [14.5041:5070]
```
            PROGRESS.join();
```
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_interaction::progress::{Spinner, OUTPUT_MESSAGE};
```

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

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

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

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

[34.23910]

[7.175]

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

Deletion in pijul/src/commands/apply.rs at line 219 [12.194289]
B:BD[52.1642] → [14.5340:5369]
```
            PROGRESS.join();
```
Deletion in pijul/Cargo.toml at line 94 [12.196374]
B:BD[12.198110] → [13.11649:11671]
```
terminal_size = "0.1"
```
Insertion in pijul/Cargo.toml at line 110 [12.196374]
[53.310]
[54.0]
```
pijul-interaction = { path = "../pijul-interaction" }
```

Migrate from `pijul::progress` to `pijul_interaction::progress`

Dependencies

In channels

Change contents

File deletion: progress.rs

Insertion in pijul/src/remote/ssh.rs at line 21 [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]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in pijul/src/remote/mod.rs at line 1373 [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]

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

Insertion in pijul/src/remote/local.rs at line 11 [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 268 [12.79745]

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

Insertion in pijul/src/remote/http.rs at line 10 [40.10]

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

Replacement in pijul/src/remote/http.rs at line 147 [40.10]

Replacement in pijul/src/remote/http.rs at line 162 [40.10]

Replacement in pijul/src/remote/http.rs at line 168 [40.10]

Replacement in pijul/src/remote/http.rs at line 174 [40.10]

Replacement in pijul/src/remote/http.rs at line 211 [40.10]

Replacement in pijul/src/remote/http.rs at line 225 [40.10]

Replacement in pijul/src/remote/http.rs at line 290 [40.10]

Replacement in pijul/src/remote/http.rs at line 542 [40.10]

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

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]

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

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

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

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

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

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

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

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

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

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

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

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

Deletion in pijul/src/commands/apply.rs at line 10 [12.194289]

Insertion in pijul/src/commands/apply.rs at line 11 [12.194289]

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