pijul/pijul - Change 4XLHUME7YLJV6XUZBOW7PX62TCJXIWW2CPITXO5GZOULWGXRVDZAC

Fixing a interlocking when cloning from a particular patch

Created by pmeunier on February 27, 2023

4XLHUME7YLJV6XUZBOW7PX62TCJXIWW2CPITXO5GZOULWGXRVDZAC

Dependencies

In channels

main

In discussions

#712 [CLONE] hang on change clone

Change contents

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

B:BD[3.3747] → [3.3747:3799]

        sender: &mut tokio::sync::mpsc::Sender<CS>,

[3.3747]

[5.8820]

        sender: &mut tokio::sync::mpsc::Sender<(CS, bool)>,

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

B:BD[3.3858] → [3.3858:3918]

        sender: Option<&mut tokio::sync::mpsc::Sender<CS>>,

[3.3858]

[6.334]

        sender: Option<&mut tokio::sync::mpsc::Sender<(CS, bool)>>,

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

B:BD[7.889] → [7.889:948]

                    sender.send(hash).await.unwrap_or(());

[7.889]

[6.600]

                    sender.send((hash, true)).await.unwrap_or(());

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

B:BD[3.16031] → [3.16031:16081]

        send: &mut tokio::sync::mpsc::Sender<CS>,

[3.16031]

[4.66747]

        send: &mut tokio::sync::mpsc::Sender<(CS, bool)>,

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

B:BD[7.3307] → [7.3307:3360]

                if let Some(h) = recv.recv().await {

[7.3307]

[7.3360]

                if let Some((h, _)) = recv.recv().await {

Insertion in pijul/src/remote/mod.rs at line 1282 [4.52474]
[4.71943]
[4.71943]
```
        let mut waiting = 0;
```
Insertion in pijul/src/remote/mod.rs at line 1284 [4.52474]
[4.71974]
[3.17662]
```
            waiting += 1;
```

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

B:BD[4.72116] → [4.72116:72174]

        while let Some(hash) = recv_signal.recv().await {

[4.72116]

[3.17707]

        while let Some((hash, follow)) = recv_signal.recv().await {

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

B:BD[3.17752] → [3.17752:18201]

                libpijul::changestore::filesystem::push_filename(&mut change_path, &hash);
                std::fs::create_dir_all(change_path.parent().unwrap())?;
                use libpijul::changestore::ChangeStore;
                hashes.push(CS::Change(hash));
                for dep in repo.changes.get_dependencies(&hash)? {
                    let dep: libpijul::pristine::Hash = dep;
                    send_hash.send(CS::Change(dep))?;

[3.17752]

[3.18201]

                waiting -= 1;
                if follow {
                    libpijul::changestore::filesystem::push_filename(&mut change_path, &hash);
                    std::fs::create_dir_all(change_path.parent().unwrap())?;
                    use libpijul::changestore::ChangeStore;
                    hashes.push(CS::Change(hash));
                    for dep in repo.changes.get_dependencies(&hash)? {
                        let dep: libpijul::pristine::Hash = dep;
                        PROGRESS.borrow_mut().unwrap()[pro_n].incr_len();
                        send_hash.send(CS::Change(dep))?;
                        waiting += 1
                    }
                    libpijul::changestore::filesystem::pop_filename(&mut change_path);

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

B:BD[3.18219] → [3.18219:18302]

                libpijul::changestore::filesystem::pop_filename(&mut change_path);

[3.18219]

[4.72577]

            }
            if waiting == 0 {
                break

Replacement in pijul/src/remote/mod.rs at line 1316 [4.52474]
∅:D[8.578] → [9.207:247]
B:BD[9.207] → [9.207:247]
```
            for hash in hashes.iter() {
```
[8.578]
[3.18303]
```
            for hash in hashes.iter().rev() {
```

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

B:BD[3.18352] → [3.18352:18439]

                    txn.apply_change_ws(&repo.changes, &mut channel_, hash, &mut ws)?;

[3.18352]

[3.18439]

                    txn.apply_change_rec_ws(&repo.changes, &mut channel_, hash, &mut ws)?;

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

B:BD[3.22329] → [3.22329:22379]

        send: &mut tokio::sync::mpsc::Sender<CS>,

[3.22329]

[5.11839]

        send: &mut tokio::sync::mpsc::Sender<(CS, bool)>,

Insertion in pijul/src/remote/local.rs at line 215 [4.79745]
[5.12233]
[2.1246]
```
                send.send((c, false)).await?;
```
Deletion in pijul/src/remote/local.rs at line 222 [4.79745]
B:BD[5.12478] → [2.1479:1517]
```
            debug!("hard link done");
```
Replacement in pijul/src/remote/local.rs at line 224 [4.79745]
∅:D[2.1673] → [5.12672:12700]
B:BD[5.12672] → [5.12672:12700]
B:BD[5.12700] → [10.3059:3092]
```
            debug!("sent");
            send.send(c).await?;
```
[2.1673]
[11.3741]
```
            send.send((c, true)).await?;
```
Insertion in pijul/src/remote/local.rs at line 258 [4.79745]
[12.10387]
[12.10387]
```
            debug!("hard link done");
```

Replacement in pijul/src/remote/http.rs at line 143 [13.10]

B:BD[3.24786] → [3.24786:24836]

        send: &mut tokio::sync::mpsc::Sender<CS>,

[3.24786]

[14.1436]

        send: &mut tokio::sync::mpsc::Sender<(CS, bool)>,

Replacement in pijul/src/remote/http.rs at line 166 [13.10]
∅:D[15.323] → [16.902:951]
∅:D[17.3019] → [16.902:951]
∅:D[7.5138] → [16.902:951]
B:BD[16.902] → [16.902:951]
```
                if send.send(c).await.is_err() {
```
[17.3019]
[14.1944]
```
                if send.send((c, true)).await.is_err() {
```
Replacement in pijul/src/remote/http.rs at line 179 [13.10]
∅:D[15.376] → [18.239:288]
∅:D[17.3089] → [18.239:288]
∅:D[7.5275] → [18.239:288]
B:BD[18.239] → [18.239:288]
```
                if send.send(c).await.is_err() {
```
[17.3089]
[18.288]
```
                if send.send((c, true)).await.is_err() {
```

Fixing a interlocking when cloning from a particular patch

Dependencies

In channels

In discussions

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in pijul/src/remote/local.rs at line 215 [4.79745]

Deletion in pijul/src/remote/local.rs at line 222 [4.79745]

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

Insertion in pijul/src/remote/local.rs at line 258 [4.79745]

Replacement in pijul/src/remote/http.rs at line 143 [13.10]

Replacement in pijul/src/remote/http.rs at line 166 [13.10]

Replacement in pijul/src/remote/http.rs at line 179 [13.10]