oknozor/pijul - Change 7HOBLRD43W2R5OVOYZVDO5LYPBZS7OSLDS7FH4NVNMBL3AZGMLSQC

Fixing remote push/pull

Remote IDs were wrong (the bound check was incorrect), and patches to pull weren't checked against the local channel

Created by pmeunier on September 13, 2021

7HOBLRD43W2R5OVOYZVDO5LYPBZS7OSLDS7FH4NVNMBL3AZGMLSQC

Dependencies

In channels

main

Change contents

Replacement in "pijul/src/remote/ssh.rs" at line 464 [7.25380]

B:BD[5.1195] → [6.63:115]

                    debug!("state: Id {:?}", data);

[5.1195]

[5.1250]

                    debug!("state: Id {:?}", std::str::from_utf8(&data));

Replacement in "pijul/src/remote/ssh.rs" at line 560 [7.25380]

B:BD[8.6244] → [8.6244:6290]

                        debug!("{:?}", data);

[8.6244]

[8.6290]

                        trace!("{:?}", data);

Replacement in "pijul/src/remote/mod.rs" at line 313 [7.52474]

B:BD[9.7957] → [9.7957:8064]

B:BD[9.8064] → [9.8064:8117]

B:BD[9.8117] → [9.8117:8141]

        let to_download: Result<Vec<libpijul::Hash>, anyhow::Error> = specific_changes
            .iter()
            .map(|h| Ok(txn.hash_from_prefix(h)?.0))
            .collect();

[9.7957]

[9.8141]

        let mut to_download = Vec::new();
        for h in specific_changes {
            let h = txn.hash_from_prefix(h)?.0;
            if txn.get_revchanges(current_channel, &h)?.is_none() {
                to_download.push(h)
            }
        }

Replacement in "pijul/src/remote/mod.rs" at line 322 [7.52474]
B:BD[9.8202] → [9.8202:8241]
```
            to_download: to_download?,
```
[9.8202]
[9.8241]
```
            to_download,
```
Replacement in "pijul/src/remote/mod.rs" at line 489 [7.52474]
B:BD[9.11135] → [9.11135:11172]
```
        debug!("update_changelist");
```
[9.11135]
[9.11172]
```
        debug!("update_changelist_pushpull");
```
Insertion in "pijul/src/remote/mod.rs" at line 502 [7.52474]
[3.325]
[3.325]
```
            debug!("id = {:?}", id);
```
Insertion in "pijul/src/remote/mod.rs" at line 505 [7.52474]
[3.357]
[3.357]
```
            debug!("no id, starting from scratch");
```

Replacement in "pijul/src/remote/mod.rs" at line 511 [7.52474]

B:BD[3.673] → [3.673:711]

                to_download.push(*h);

[3.673]

[3.711]

                if txn.get_revchanges(current_channel, h)?.is_none() {
                    to_download.push(*h);
                }

Insertion in "pijul/src/commands/pushpull.rs" at line 259 [7.111631]

[10.913]

            u.sort_by(|a, b| {
                let na = txn.get_revchanges(&channel, a).unwrap().unwrap();
                let nb = txn.get_revchanges(&channel, b).unwrap().unwrap();
                na.cmp(&nb)
            });

Replacement in "pijul/src/commands/pushpull.rs" at line 277 [7.111631]

B:BD[11.158] → [9.20565:20666]

                let comp = complete_deps(&*txn.read(), &remote_ref, &repo.changes, &to_upload, &d)?;

[11.158]

[11.232]

                let comp = complete_deps(&*txn.read(), &remote_ref, &repo.changes, &d)?;

Replacement in "pijul/src/commands/pushpull.rs" at line 421 [7.111631]

B:BD[11.566] → [12.10088:10185]

                let comp = complete_deps(&*txn.read(), &None, &repo.changes, &to_download, &d)?;

[11.566]

[11.642]

                let comp = complete_deps(&*txn.read(), &None, &repo.changes, &d)?;

Deletion in "pijul/src/commands/pushpull.rs" at line 558 [7.111631]
B:BD[11.854] → [13.2826:2859]
```
    original: &[libpijul::Hash],
```

Replacement in "pijul/src/commands/pushpull.rs" at line 560 [7.111631]

∅:D[13.2937] → [11.995:1054]

B:BD[11.995] → [11.995:1054]

B:BD[11.1054] → [2.0:116]

B:BD[2.116] → [2.116:184]

B:BD[2.184] → [2.184:190]

B:BD[2.190] → [2.190:245]

B:BD[2.245] → [2.245:283]

∅:D[2.283] → [11.1141:1213]

B:BD[11.1141] → [11.1141:1213]

B:BD[11.1213] → [2.284:327]

    let original_: HashSet<_> = original.iter().collect();
    let mut now_ = HashSet::with_capacity(original.len());
    let mut result = Vec::with_capacity(original.len());
    for &h in now {
        now_.insert(h);
        result.push(h);
    }
    let mut stack = now.to_vec();
    stack.reverse();
    while let Some(n) = stack.pop() {
        // check that all of `now`'s deps are in now or not in original
        for d in c.get_dependencies(&n)? {

[13.2937]

[14.298]

    let mut now_ = HashSet::new();
    let mut result = Vec::new();
    for &h in now.iter() {
        for d in c.get_dependencies(&h)? {

Replacement in "pijul/src/commands/pushpull.rs" at line 569 [7.111631]
∅:D[14.463] → [11.1255:1326]
B:BD[11.1255] → [11.1255:1326]
```
            if original_.get(&d).is_some() && now_.get(&d).is_none() {
```
[14.463]
[11.1326]
```
            if now_.insert(d) {
```
Replacement in "pijul/src/commands/pushpull.rs" at line 571 [7.111631]
B:BD[11.1358] → [11.1358:1390]
B:BD[11.1390] → [2.328:359]
```
                now_.insert(d);
                stack.push(d);
```
[11.1358]
[11.1390]
```
                continue;
```

Replacement in "pijul/src/commands/pushpull.rs" at line 574 [7.111631]

B:BD[11.1414] → [2.360:415]

        if now_.insert(n) {
            result.push(n)

[11.1414]

[15.2286]

        if now_.insert(h) {
            result.push(h)

Replacement in "libpijul/src/pristine/mod.rs" at line 264 [7.586748]

B:BD[5.36086] → [4.0:35]

        if b.len() != bb.0.len() {

[5.36086]

[4.35]

        if b.len() != data_encoding::BASE32_NOPAD.encode_len(16) {

Fixing remote push/pull

Dependencies

In channels

Change contents

Replacement in "pijul/src/remote/ssh.rs" at line 464 [7.25380]

Replacement in "pijul/src/remote/ssh.rs" at line 560 [7.25380]

Replacement in "pijul/src/remote/mod.rs" at line 313 [7.52474]

Replacement in "pijul/src/remote/mod.rs" at line 322 [7.52474]

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

Insertion in "pijul/src/remote/mod.rs" at line 502 [7.52474]

Insertion in "pijul/src/remote/mod.rs" at line 505 [7.52474]