dblsaiko/pijul - Change 2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC

Change completions (where the whole progress bar story started)

Created by pmeunier on March 1, 2021

2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 774 [4.25380]

B:BD[4.45470] → [5.71:143]

        progress: Arc<std::sync::Mutex<crate::progress::InnerCursors>>,

[4.45470]

[5.143]

        pro_n: usize,

Replacement in pijul/src/remote/ssh.rs at line 780 [4.25380]

B:BD[4.45564] → [5.224:301]

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

[4.45564]

[6.131]

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

Replacement in pijul/src/remote/ssh.rs at line 786 [4.25380]

B:BD[6.208] → [5.302:374]

        progress: Arc<std::sync::Mutex<crate::progress::InnerCursors>>,

[6.208]

[5.374]

        pro_n: usize,

Replacement in pijul/src/remote/ssh.rs at line 811 [4.25380]

B:BD[5.738] → [3.0:52]

                progress.lock().unwrap()[0].incr();

[5.738]

[5.798]

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

Insertion in pijul/src/remote/ssh.rs at line 818 [4.25380]
[5.975]
[5.975]
```
        let mut received = false;
```
Insertion in pijul/src/remote/ssh.rs at line 820 [4.25380]
[5.1020]
[5.1020]
```
            received = true;
```

Insertion in pijul/src/remote/ssh.rs at line 835 [4.25380]

[4.49753]

[5.1498]

        if !received {
            *self.state.lock().await = State::None;
        };

Insertion in pijul/src/remote/mod.rs at line 22 [4.52474]
[7.10383]
[7.10383]
```
use crate::progress::PROGRESS;
```

Replacement in pijul/src/remote/mod.rs at line 332 [4.52474]

B:BD[4.66710] → [5.1517:1589]

        progress: Arc<std::sync::Mutex<crate::progress::InnerCursors>>,

[4.66710]

[5.1589]

        pro_n: usize,

Replacement in pijul/src/remote/mod.rs at line 340 [4.52474]

B:BD[4.67232] → [5.1675:1807]

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

[4.67232]

[5.1807]

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

Replacement in pijul/src/remote/mod.rs at line 342 [4.52474]

B:BD[5.1851] → [5.1851:1950]

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

[5.1851]

[5.1950]

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

Replacement in pijul/src/remote/mod.rs at line 345 [4.52474]

B:BD[5.2009] → [5.2009:2108]

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

[5.2009]

[5.2108]

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

Replacement in pijul/src/remote/mod.rs at line 353 [4.52474]

B:BD[4.68736] → [8.51:99]

    pub async fn pull<T: MutTxnTExt + TxnTExt>(

[4.68736]

[8.99]

    pub async fn pull<T: MutTxnTExt + TxnTExt + GraphIter>(

Replacement in pijul/src/remote/mod.rs at line 362 [4.52474]

B:BD[9.1407] → [5.2123:2247]

B:BD[5.2247] → [3.53:105]

        let progress = crate::progress::Cursors::new();
        {
            let mut pro = progress.borrow_mut().unwrap();
            pro.push(crate::progress::Cursor::Bar {

[9.1407]

[5.2307]

        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 {

Replacement in pijul/src/remote/mod.rs at line 372 [4.52474]

B:BD[5.2364] → [5.2364:2457]

B:BD[5.2457] → [3.106:162]

∅:D[3.162] → [5.2521:2674]

B:BD[5.2521] → [5.2521:2674]

                pre: "Downloading changes".into(),
            });
            if do_apply {
                pro.push(crate::progress::Cursor::Bar {
                    i: 0,
                    n: to_apply.len(),
                    pre: "Applying".into(),
                });
            }
        }

[5.2364]

[5.2674]

                pre: "Applying".into(),
            }))
        } else {
            None
        };
        std::mem::drop(pro);

Deletion in pijul/src/remote/mod.rs at line 386 [4.52474]
B:BD[10.1472] → [5.2758:2806]
```
        let progress_ = progress.inner.clone();
```

Replacement in pijul/src/remote/mod.rs at line 388 [4.52474]

B:BD[10.1532] → [5.2807:3024]

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

[10.1532]

[10.1619]

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

Replacement in pijul/src/remote/mod.rs at line 446 [4.52474]
B:BD[9.2529] → [5.3474:3500]
```
            if do_apply {
```
[9.2529]
[11.972]
```
            if let Some(pro_b) = pro_b {
```

Replacement in pijul/src/remote/mod.rs at line 448 [4.52474]

B:BD[11.1015] → [3.163:221]

                progress.inner.lock().unwrap()[1].incr();

[11.1015]

[5.3567]

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

Replacement in pijul/src/remote/mod.rs at line 460 [4.52474]
B:BD[12.321] → [5.3666:3691]
```
        progress.join();
```
[12.321]
[9.2530]
```
        debug!("join");
        PROGRESS.join();
```

Replacement in pijul/src/remote/mod.rs at line 465 [4.52474]

B:BD[4.70881] → [4.70881:70934]

    pub async fn clone_tag<T: MutTxnTExt + TxnTExt>(

[4.70881]

[4.70934]

    pub async fn clone_tag<T: MutTxnTExt + TxnTExt + GraphIter>(

Replacement in pijul/src/remote/mod.rs at line 477 [4.52474]

B:BD[4.71386] → [5.3774:3830]

        let progress = crate::progress::Cursors::new();

[4.71386]

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

Replacement in pijul/src/remote/mod.rs at line 489 [4.52474]

B:BD[5.3866] → [5.3866:3910]

                    progress.inner.clone(),

[5.3866]

[5.3910]

                    pro_n,

Replacement in pijul/src/remote/mod.rs at line 519 [4.52474]

B:BD[4.72806] → [4.72806:72852]

B:BD[4.72852] → [13.7733:7807]

        while let Some(hash) = hashes.pop() {
            txn.apply_change_ws(&repo.changes, channel, &hash, &mut ws)?;

[4.72806]

[4.72925]

        for hash in hashes.iter() {
            txn.apply_change_ws(&repo.changes, channel, hash, &mut ws)?;

Insertion in pijul/src/remote/mod.rs at line 524 [4.52474]

[4.73007]

        self.complete_changes(repo, txn, channel, &hashes, false)
            .await?;

Replacement in pijul/src/remote/mod.rs at line 529 [4.52474]

B:BD[4.73029] → [4.73029:73084]

    pub async fn clone_state<T: MutTxnTExt + TxnTExt>(

[4.73029]

[4.73084]

    pub async fn clone_state<T: MutTxnTExt + TxnTExt + GraphIter>(

Insertion in pijul/src/remote/mod.rs at line 554 [4.52474]

[9.2736]

            .await?;
        self.complete_changes(repo, txn, channel, &to_pull, false)

Replacement in pijul/src/remote/mod.rs at line 574 [4.52474]

B:BD[4.75363] → [5.4223:4279]

        let progress = crate::progress::Cursors::new();

[4.75363]

        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);

Replacement in pijul/src/remote/mod.rs at line 585 [4.52474]

B:BD[10.2126] → [5.4280:4512]

                .download_changes(
                    progress.inner.clone(),
                    &mut recv_hash,
                    &mut send_sig,
                    &mut changes_dir,
                    true,
                )

[10.2126]

[10.2215]

                .download_changes(pro_n, &mut recv_hash, &mut send_sig, &mut changes_dir, true)

Insertion in pijul/src/remote/mod.rs at line 602 [4.52474]

[5.4550]

[4.76371]

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

Insertion in pijul/src/remote/mod.rs at line 627 [4.52474]

[5.4592]

[10.2719]

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

Insertion in pijul/src/remote/mod.rs at line 636 [4.52474]
[4.77704]
[4.77704]
```
        PROGRESS.join();
```

Replacement in pijul/src/remote/mod.rs at line 640 [4.52474]

B:BD[4.77726] → [4.77726:77783]

    pub async fn clone_channel<T: MutTxnTExt + TxnTExt>(

[4.77726]

[4.77783]

    pub async fn clone_channel<T: MutTxnTExt + TxnTExt + GraphIter>(

Insertion in pijul/src/remote/mod.rs at line 658 [4.52474]

[9.2894]

        self.complete_changes(repo, txn, local_channel, &pullable, false)
            .await?;

Replacement in pijul/src/remote/local.rs at line 129 [4.79745]
B:BD[4.83512] → [5.4593:4665]
```
        progress: Arc<std::sync::Mutex<crate::progress::InnerCursors>>,
```
[4.83512]
[5.4665]
```
        pro_n: usize,
```

Replacement in pijul/src/remote/local.rs at line 137 [4.79745]

B:BD[10.3058] → [3.222:270]

            progress.lock().unwrap()[0].incr();

[10.3058]

[7.12057]

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

Replacement in pijul/src/remote/http.rs at line 74 [15.10]

B:BD[14.1135] → [5.4808:4891]

        progress: std::sync::Arc<std::sync::Mutex<crate::progress::InnerCursors>>,

[14.1135]

[5.4891]

        pro_n: usize,

Replacement in pijul/src/remote/http.rs at line 97 [15.10]

B:BD[5.5078] → [3.271:323]

                progress.lock().unwrap()[0].incr();

[5.5078]

[16.902]

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

Replacement in pijul/src/remote/http.rs at line 110 [15.10]

B:BD[5.5215] → [3.324:376]

                progress.lock().unwrap()[0].incr();

[5.5215]

[17.239]

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

Insertion in pijul/src/progress.rs at line 1 [5.5323]
[5.5323]
[5.5324]
```
use log::*;
```

Insertion in pijul/src/progress.rs at line 6 [5.5323]

[5.5396]

lazy_static::lazy_static! {
    pub static ref PROGRESS: crate::progress::Cursors = crate::progress::Cursors::new();
}

Replacement in pijul/src/progress.rs at line 12 [5.5323]
B:BD[5.5458] → [5.5458:5494]
```
    t: std::thread::JoinHandle<()>,
```
[5.5458]
[5.5494]
```
    t: Mutex<Option<std::thread::JoinHandle<()>>>,
```

Replacement in pijul/src/progress.rs at line 47 [5.5323]

B:BD[5.5894] → [5.5894:5980]

        let inner_ = inner.clone();
        let t = std::thread::spawn(move || loop {

[5.5894]

[5.5980]

        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 {

Replacement in pijul/src/progress.rs at line 77 [5.5323]
B:BD[5.6435] → [5.6435:6476]
```
        });
        Cursors { inner, t }
```
[5.6435]
[5.6476]
```
        }));
```
Insertion in pijul/src/progress.rs at line 81 [5.5323]
[5.6508]
[5.6508]
```
        debug!("stop");
```
Replacement in pijul/src/progress.rs at line 87 [5.5323]
B:BD[5.6598] → [5.6598:6622]
```
    pub fn join(self) {
```
[5.6598]
[5.6622]
```
    pub fn join(&self) {
        debug!("join");
```

Replacement in pijul/src/progress.rs at line 90 [5.5323]

B:BD[5.6643] → [5.6643:6675]

        self.t.join().unwrap();

[5.6643]

[5.6675]

        let mut t = self.t.lock().unwrap();
        if let Some(t) = t.take() {
            t.join().unwrap();
        }

Insertion in pijul/src/progress.rs at line 102 [5.5323]

[5.6863]

        debug!("borrow_mut");
        self.restart();

Insertion in pijul/src/progress.rs at line 105 [5.5323]
[5.6903]
[5.6903]
```
        m.stop = false;
```

Insertion in pijul/src/progress.rs at line 153 [5.5323]

[5.7823]

            _ => {}
        }
    }
    pub fn incr_len(&mut self) {
        match self {
            Cursor::Bar { n, .. } => *n += 1,

Replacement in pijul/src/progress.rs at line 205 [5.5323]

B:BD[3.1037] → [3.1037:1096]

                    let k = (wb as usize * *i) / (*n - 1);

[3.1037]

[3.1096]

                    let k = (wb as usize * *i) / *n;

Insertion in pijul/src/commands/reset.rs at line 11 [4.97650]
[18.1348]
[18.1348]
```
use crate::progress::PROGRESS;
```

Insertion in pijul/src/commands/reset.rs at line 146 [4.97650]

[19.343]

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

Insertion in pijul/src/commands/reset.rs at line 174 [4.97650]
[19.734]
[4.101179]
```
                PROGRESS.join();
```

Insertion in pijul/src/commands/reset.rs at line 176 [4.97650]

[4.101200]

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

Insertion in pijul/src/commands/reset.rs at line 195 [4.97650]
[4.101673]
[4.101673]
```
                PROGRESS.join();
```
Insertion in pijul/src/commands/pushpull.rs at line 14 [4.111631]
[18.1761]
[18.1761]
```
use crate::progress::PROGRESS;
```

Insertion in pijul/src/commands/pushpull.rs at line 455 [4.111631]

[2.1366]

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

Insertion in pijul/src/commands/pushpull.rs at line 487 [4.111631]
[20.679]
[9.11126]
```
            PROGRESS.join();
```
Insertion in pijul/src/commands/clone.rs at line 82 [4.182891]
[4.185601]
[4.185601]
Insertion in pijul/src/commands/apply.rs at line 10 [4.194289]
[18.3380]
[18.3380]
```
use crate::progress::PROGRESS;
```

Insertion in pijul/src/commands/apply.rs at line 93 [4.194289]

[2.3383]

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

Insertion in pijul/src/commands/apply.rs at line 120 [4.194289]
[19.1642]
[19.1642]
```
            PROGRESS.join();
```

Change completions (where the whole progress bar story started)

Dependencies

In channels

Change contents

Replacement in pijul/src/remote/ssh.rs at line 774 [4.25380]

Replacement in pijul/src/remote/ssh.rs at line 780 [4.25380]

Replacement in pijul/src/remote/ssh.rs at line 786 [4.25380]

Replacement in pijul/src/remote/ssh.rs at line 811 [4.25380]

Insertion in pijul/src/remote/ssh.rs at line 818 [4.25380]

Insertion in pijul/src/remote/ssh.rs at line 820 [4.25380]

Insertion in pijul/src/remote/ssh.rs at line 835 [4.25380]

Insertion in pijul/src/remote/mod.rs at line 22 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 332 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 340 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 342 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 345 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 353 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 362 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 372 [4.52474]

Deletion in pijul/src/remote/mod.rs at line 386 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 388 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 446 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 448 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 460 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 465 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 477 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 489 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 519 [4.52474]

Insertion in pijul/src/remote/mod.rs at line 524 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 529 [4.52474]

Insertion in pijul/src/remote/mod.rs at line 554 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 574 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 585 [4.52474]

Insertion in pijul/src/remote/mod.rs at line 602 [4.52474]

Insertion in pijul/src/remote/mod.rs at line 627 [4.52474]

Insertion in pijul/src/remote/mod.rs at line 636 [4.52474]

Replacement in pijul/src/remote/mod.rs at line 640 [4.52474]

Insertion in pijul/src/remote/mod.rs at line 658 [4.52474]

Replacement in pijul/src/remote/local.rs at line 129 [4.79745]

Replacement in pijul/src/remote/local.rs at line 137 [4.79745]

Replacement in pijul/src/remote/http.rs at line 74 [15.10]

Replacement in pijul/src/remote/http.rs at line 97 [15.10]

Replacement in pijul/src/remote/http.rs at line 110 [15.10]

Insertion in pijul/src/progress.rs at line 1 [5.5323]

Insertion in pijul/src/progress.rs at line 6 [5.5323]

Replacement in pijul/src/progress.rs at line 12 [5.5323]

Replacement in pijul/src/progress.rs at line 47 [5.5323]

Replacement in pijul/src/progress.rs at line 77 [5.5323]

Insertion in pijul/src/progress.rs at line 81 [5.5323]

Replacement in pijul/src/progress.rs at line 87 [5.5323]

Replacement in pijul/src/progress.rs at line 90 [5.5323]

Insertion in pijul/src/progress.rs at line 102 [5.5323]

Insertion in pijul/src/progress.rs at line 105 [5.5323]

Insertion in pijul/src/progress.rs at line 153 [5.5323]

Replacement in pijul/src/progress.rs at line 205 [5.5323]

Insertion in pijul/src/commands/reset.rs at line 11 [4.97650]

Insertion in pijul/src/commands/reset.rs at line 146 [4.97650]

Insertion in pijul/src/commands/reset.rs at line 174 [4.97650]

Insertion in pijul/src/commands/reset.rs at line 176 [4.97650]

Insertion in pijul/src/commands/reset.rs at line 195 [4.97650]

Insertion in pijul/src/commands/pushpull.rs at line 14 [4.111631]

Insertion in pijul/src/commands/pushpull.rs at line 455 [4.111631]

Insertion in pijul/src/commands/pushpull.rs at line 487 [4.111631]

Insertion in pijul/src/commands/clone.rs at line 82 [4.182891]

Insertion in pijul/src/commands/apply.rs at line 10 [4.194289]

Insertion in pijul/src/commands/apply.rs at line 93 [4.194289]

Insertion in pijul/src/commands/apply.rs at line 120 [4.194289]