irevoire/pijul - Change KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC

Locking stderr and the progress bar in SSH

Created by pmeunier on December 5, 2020

KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC

Dependencies

In channels

main

Change contents

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

B:BD[4.26182] → [4.26182:26197]

    .unwrap();

[4.26182]

[4.26197]

        .unwrap();
    static ref PROGRESS: Arc<Mutex<Option<ProgressBar>>> = Arc::new(Mutex::new(None));

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

B:BD[5.268] → [3.2447:2584]

            let stderr = std::io::stderr();
            let mut handle = stderr.lock();
            let result = handle.write_all(data);

[5.268]

[5.365]

            let data = data.to_vec();

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

B:BD[5.399] → [5.399:424]

                result?;

[5.399]

[5.424]

                *PROGRESS.lock().await = None;
                let stderr = std::io::stderr();
                let mut handle = stderr.lock();
                handle.write_all(&data)?;

Insertion in pijul/src/remote/ssh.rs at line 692 [4.25380]
[2.166]
[4.44567]
```
        *PROGRESS.lock().await = Some(progress);
```

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

B:BD[4.45306] → [5.604:633]

            progress.inc(1);

[4.45306]

            if let Some(ref mut progress) = *PROGRESS.lock().await {
                progress.inc(1);
            }

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

B:BD[4.45389] → [2.167:335]

∅:D[2.335] → [5.634:661]

B:BD[4.45389] → [5.634:661]

        progress.set_style(
            indicatif::ProgressStyle::default_bar()
                .template("✓ Uploading changes   {wide_bar} {pos}/{len}"),
        );
        progress.finish();

[4.45389]

        if let Some(ref mut progress) = *PROGRESS.lock().await {
            progress.set_style(
                indicatif::ProgressStyle::default_bar()
                    .template("✓ Uploading changes   {wide_bar} {pos}/{len}"),
            );
            progress.finish();
        }

Insertion in pijul/src/remote/ssh.rs at line 778 [4.25380]
[6.166]
[7.9753]
```
        *PROGRESS.lock().await = Some(progress);
```

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

B:BD[7.9854] → [8.136:165]

            progress.inc(1);

[7.9854]

[9.427]

            if let Some(ref mut progress) = *PROGRESS.lock().await {
                progress.inc(1);
            }

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

B:BD[9.533] → [9.533:573]

                    progress.abandon();

[9.533]

[9.573]

                    if let Some(ref mut progress) = *PROGRESS.lock().await {
                        progress.abandon();
                    }

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

B:BD[8.213] → [8.213:250]

B:BD[8.250] → [6.167:351]

∅:D[6.351] → [8.250:281]

B:BD[8.250] → [8.250:281]

        if !progress.is_finished() {
            progress.set_style(
                indicatif::ProgressStyle::default_bar()
                    .template("✓ Downloading changes {wide_bar} {pos}/{len}"),
            );
            progress.finish();

[8.213]

[4.49743]

        if let Some(ref mut progress) = *PROGRESS.lock().await {
            if !progress.is_finished() {
                progress.set_style(
                    indicatif::ProgressStyle::default_bar()
                        .template("✓ Downloading changes {wide_bar} {pos}/{len}"),
                );
                progress.finish();
            }

Insertion in pijul/src/remote/ssh.rs at line 826 [4.25380]
[8.520]
[4.50173]
```
        *PROGRESS.lock().await = Some(progress);
```

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

B:BD[4.51338] → [6.352:470]

∅:D[6.470] → [8.521:548]

B:BD[4.51338] → [8.521:548]

        progress
            .set_style(indicatif::ProgressStyle::default_spinner().template("✓ Cloning channel"));
        progress.finish();

[4.51338]

        if let Some(ref mut progress) = *PROGRESS.lock().await {
            progress.set_style(
                indicatif::ProgressStyle::default_spinner().template("✓ Cloning channel"),
            );
            progress.finish();
        }