ilyagr/pijul - Change 5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC

Fixing a race condition between progress bars

Created by pmeunier on December 6, 2020

5QTMRUXNE2XNJCMLN6MQN24UEZ55EFC3LIR4PO6OPNTT5KEL7WXQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 690 [5.25380]

B:BD[4.80] → [4.80:155]

                .template("  Uploading changes   {wide_bar} {pos}/{len}"),

[4.80]

[4.155]

                .template("  Uploading changes   {wide_bar} {pos:>5}/{len}"),

Insertion in pijul/src/remote/ssh.rs at line 692 [5.25380]
[4.166]
[3.333]
```
        let progress = super::PROGRESS.add(progress);
```

Replacement in pijul/src/remote/ssh.rs at line 719 [5.25380]

B:BD[3.653] → [3.653:734]

                    .template("✓ Uploading changes   {wide_bar} {pos}/{len}"),

[3.653]

[3.734]

                    .template("✓ Uploading changes {pos:>5}/{len}"),

Replacement in pijul/src/remote/ssh.rs at line 777 [5.25380]

B:BD[6.80] → [6.80:155]

                .template("  Downloading changes {wide_bar} {pos}/{len}"),

[6.80]

[6.155]

                .template("  Downloading changes {wide_bar} {pos:>5}/{len}"),

Replacement in pijul/src/remote/ssh.rs at line 798 [5.25380]

B:BD[3.1304] → [3.1304:1389]

                        .template("✓ Downloading changes {wide_bar} {pos}/{len}"),

[3.1304]

[3.1389]

                        .template("✓ Downloading changes {pos:>5}/{len}"),

Insertion in pijul/src/remote/mod.rs at line 4 [5.52474]
[7.439]
[8.516]
```
use lazy_static::lazy_static;
```

Insertion in pijul/src/remote/mod.rs at line 28 [5.52474]

[5.52848]

}
lazy_static! {
    static ref PROGRESS: Arc<indicatif::MultiProgress> = Arc::new(indicatif::MultiProgress::new());

Replacement in pijul/src/remote/mod.rs at line 468 [5.52474]

B:BD[6.986] → [6.986:1065]

                    .template("  Applying changes    {wide_bar} {pos}/{len}"),

[6.986]

[6.1065]

                    .template("  Applying changes    {wide_bar} {pos:>5}/{len}"),

Replacement in pijul/src/remote/mod.rs at line 470 [5.52474]
∅:D[6.1080] → [9.729:749]
B:BD[9.729] → [9.729:749]
```
            Some(p)
```
[6.1080]
[9.749]
```
            Some(PROGRESS.add(p))
```

Insertion in pijul/src/remote/mod.rs at line 474 [5.52474]

[9.794]

[5.69865]

        let t_progress = std::thread::spawn(|| {
            PROGRESS.join().unwrap_or(());
        });

Replacement in pijul/src/remote/mod.rs at line 504 [5.52474]

B:BD[6.1177] → [6.1177:1262]

                        .template("✓ Applying changes    {wide_bar} {pos}/{len}"),

[6.1177]

[6.1262]

                        .template("✓ Applying changes {pos:>5}/{len}"),

Insertion in pijul/src/remote/mod.rs at line 511 [5.52474]
[2.321]
[5.70716]
```
        t_progress.join().unwrap();
```

Replacement in pijul/src/remote/http.rs at line 26 [10.10]

B:BD[6.1362] → [6.1362:1437]

                .template("  Downloading changes {wide_bar} {pos}/{len}"),

[6.1362]

[6.1437]

                .template("  Downloading changes {wide_bar} {pos:>5}/{len}"),

Insertion in pijul/src/remote/http.rs at line 28 [10.10]
[6.1448]
[10.432]
```
        let progress = super::PROGRESS.add(progress);
```

Replacement in pijul/src/remote/http.rs at line 66 [10.10]

B:BD[6.1537] → [6.1537:1618]

                    .template("✓ Downloading changes {wide_bar} {pos}/{len}"),

[6.1537]

[6.1618]

                    .template("✓ Downloading changes {pos:>5}/{len}"),

Replacement in pijul/src/remote/http.rs at line 82 [10.10]

B:BD[6.1714] → [4.336:411]

                .template("  Uploading changes   {wide_bar} {pos}/{len}"),

[6.1714]

[6.1787]

                .template("  Uploading changes   {wide_bar} {pos:>5}/{len}"),

Replacement in pijul/src/remote/http.rs at line 106 [10.10]

B:BD[6.1827] → [6.1827:1879]

B:BD[6.1879] → [4.412:489]

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

[6.1827]

[6.1954]

            indicatif::ProgressStyle::default_bar().template("✓ Uploading changes {pos:>5}/{len}"),