mx00s/pijul - Change RM225IDQR36MNBMN7OT2R562M4FUD6L34RY7A3WDBBETZIIDKZ5AC

Exchanging tagged states over SSH

Created by pmeunier on December 17, 2021

RM225IDQR36MNBMN7OT2R562M4FUD6L34RY7A3WDBBETZIIDKZ5AC

Dependencies

In channels

main

Change contents

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

B:BD[4.251] → [4.251:335]

        F: FnMut(&mut A, u64, Hash, libpijul::Merkle) -> Result<(), anyhow::Error>,

[4.251]

[4.335]

        F: FnMut(&mut A, u64, Hash, libpijul::Merkle, bool) -> Result<(), anyhow::Error>,

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

B:BD[6.528] → [4.381:452]

                super::ListLine::Change { n, h, m } => f(a, n, h, m)?,

[6.528]

[6.659]

                super::ListLine::Change { n, h, m, is_tagged } => f(a, n, h, m, is_tagged)?,

Insertion in pijul/src/remote/mod.rs at line 190 [5.52474]
[7.2927]
[7.2927]
```
    pub tags: HashSet<Merkle>,
```

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

B:BD[7.3195] → [7.3195:3250]

    pub theirs_ge_dichotomy: Vec<(u64, Hash, Merkle)>,

[7.3195]

[7.3250]

    pub theirs_ge_dichotomy: Vec<(u64, Hash, Merkle, bool)>,

Replacement in pijul/src/remote/mod.rs at line 289 [5.52474]
B:BD[7.6984] → [7.6984:7022]
```
            .filter_map(|(_, h, _)| {
```
[7.6984]
[2.0]
```
            .filter_map(|(_, h, _, _)| {
```

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

B:BD[3.316] → [3.316:352]

                to_download.push(h)

[3.316]

[3.352]

                to_download.push(h);

Insertion in pijul/src/remote/mod.rs at line 330 [5.52474]
[3.402]
[7.8241]
```
            tags: HashSet::new(),
```
Insertion in pijul/src/remote/mod.rs at line 345 [5.52474]
[7.8828]
[7.8828]
```
        let mut tags = HashSet::new();
```
Replacement in pijul/src/remote/mod.rs at line 349 [5.52474]
B:BD[7.9021] → [7.9021:9056]
```
                let (h, m) = x?.1;
```
[7.9021]
[7.9056]
```
                let (n, (h, m)) = x?;
```

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

B:BD[7.9776] → [7.9776:9827]

                        to_download.push(h.into())

[7.9776]

[7.9827]

                        to_download.push(h.into());
                        if txn.is_tagged(&remote_channel.tags, n)? {
                            tags.insert(m.into());
                        }

Insertion in pijul/src/remote/mod.rs at line 379 [5.52474]
[7.9961]
[7.9961]
```
            tags,
```

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

B:BD[8.563] → [8.563:621]

            for (_, h, _) in theirs_ge_dichotomy.iter() {

[8.563]

[8.621]

            let mut tags = HashSet::new();
            for (_, h, m, is_tagged) in theirs_ge_dichotomy.iter() {

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

[3.654]

                    if *is_tagged {
                        tags.insert(*m);
                    }

Insertion in pijul/src/remote/mod.rs at line 536 [5.52474]
[8.848]
[8.848]
```
                tags,
```
Replacement in pijul/src/remote/mod.rs at line 576 [5.52474]
B:BD[7.12796] → [7.12796:12828]
```
            .map(|(_, h, _)| h)
```
[7.12796]
[7.12828]
```
            .map(|(_, h, _, _)| h)
```

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

B:BD[7.13766] → [7.13766:13894]

            for (n, h, m) in theirs_ge_dichotomy.iter().copied() {
                txn.put_remote(&mut remote_ref, n, (h, m))?;

[7.13766]

[7.13894]

            for (n, h, m, t) in theirs_ge_dichotomy.iter().copied() {
                txn.put_remote(&mut remote_ref, n, (h, m, t))?;

Insertion in pijul/src/remote/mod.rs at line 631 [5.52474]
[7.15184]
[7.15184]
```
                tags: HashSet::new(),
```

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

B:BD[7.15437] → [7.15437:15783]

            for thing in txn.iter_remote(&remote_ref.lock().remote, 0)? {
                let (_, libpijul::pristine::Pair { a: hash, b: merkle }) = thing?;
                if state_cond(txn, &merkle)? {
                    break;
                } else if change_cond(txn, &hash.into()) {
                    to_download.push(Hash::from(hash));

[7.15437]

[7.15783]

            let mut tags = HashSet::new();
            {
                let rem = remote_ref.lock();
                for thing in txn.iter_remote(&rem.remote, 0)? {
                    let (n, libpijul::pristine::Pair { a: hash, b: merkle }) = thing?;
                    if state_cond(txn, &merkle)? {
                        break;
                    } else if change_cond(txn, &hash.into()) {
                        to_download.push(Hash::from(hash));
                        if txn.is_tagged(&rem.tags, (*n).into())? {
                            tags.insert(merkle.into());
                        }
                    }

Deletion in pijul/src/remote/mod.rs at line 654 [5.52474]
B:BD[7.15815] → [7.15815:15816]
Insertion in pijul/src/remote/mod.rs at line 658 [5.52474]
[7.15944]
[7.15944]
```
                tags,
```

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

B:BD[7.16649] → [7.16649:16709]

            for (_, hash, merkle) in &theirs_ge_dichotomy {

[7.16649]

[7.16709]

            let mut tags = HashSet::new();
            for (_, hash, merkle, t) in &theirs_ge_dichotomy {

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

[7.16902]

                    if *t {
                        tags.insert(*merkle);
                    }

Insertion in pijul/src/remote/mod.rs at line 692 [5.52474]
[7.17063]
[7.17063]
```
                tags,
```

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

B:BD[7.17557] → [7.17557:17643]

    ) -> Result<(HashSet<Position<Hash>>, Vec<(u64, Hash, Merkle)>), anyhow::Error> {

[7.17557]

[7.17643]

    ) -> Result<(HashSet<Position<Hash>>, Vec<(u64, Hash, Merkle, bool)>), anyhow::Error> {

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

B:BD[7.17675] → [7.17675:17737]

        let f = |v: &mut Vec<(u64, Hash, Merkle)>, n, h, m| {

[7.17675]

[7.17737]

        let f = |v: &mut Vec<(u64, Hash, Merkle, bool)>, n, h, m, t| {

Replacement in pijul/src/remote/mod.rs at line 712 [5.52474]
B:BD[7.17778] → [7.17778:17812]
```
            Ok(v.push((n, h, m)))
```
[7.17778]
[7.17812]
```
            Ok(v.push((n, h, m, t)))
```

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

B:BD[6.1161] → [4.453:518]

        let f = |a: &mut (&mut T, &mut RemoteRef<T>), n, h, m| {

[6.1161]

[4.518]

        let f = |a: &mut (&mut T, &mut RemoteRef<T>), n, h, m, is_tagged| {

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

B:BD[4.570] → [4.570:618]

            txn.put_remote(remote, n, (h, m))?;

[4.570]

[4.618]

            txn.put_remote(remote, n, (h, m, is_tagged))?;

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

B:BD[6.2996] → [6.2996:3137]

    static ref CHANGELIST_LINE: Regex =
        Regex::new(r#"(?P<num>[0-9]+)\.(?P<hash>[A-Za-z0-9]+)\.(?P<merkle>[A-Za-z0-9]+)"#).unwrap();

[6.2996]

[6.3137]

    static ref CHANGELIST_LINE: Regex = Regex::new(
        r#"(?P<num>[0-9]+)\.(?P<hash>[A-Za-z0-9]+)\.(?P<merkle>[A-Za-z0-9]+)(?P<tag>\.)?"#
    )
    .unwrap();

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

B:BD[6.3266] → [6.3266:3309]

    Change { n: u64, h: Hash, m: Merkle },

[6.3266]

[6.3309]

    Change {
        n: u64,
        h: Hash,
        m: Merkle,
        is_tagged: bool,
    },

Insertion in pijul/src/remote/mod.rs at line 1321 [5.52474]
[6.3818]
[6.3818]
```
                is_tagged: caps.name("tag").is_some(),
```

Replacement in pijul/src/remote/local.rs at line 56 [5.79745]

B:BD[4.2043] → [4.2043:2117]

        F: FnMut(&mut A, u64, Hash, Merkle) -> Result<(), anyhow::Error>,

[4.2043]

[4.2117]

        F: FnMut(&mut A, u64, Hash, Merkle, bool) -> Result<(), anyhow::Error>,

Replacement in pijul/src/remote/local.rs at line 109 [5.79745]

B:BD[9.9387] → [4.2163:2209]

                f(a, n, h.into(), m.into())?;

[9.9387]

[5.82051]

                f(
                    a,
                    n,
                    h.into(),
                    m.into(),
                    remote_txn.is_tagged(&remote_channel.read().tags, n)?,
                )?;

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

B:BD[4.2324] → [4.2324:2408]

        F: FnMut(&mut A, u64, Hash, libpijul::Merkle) -> Result<(), anyhow::Error>,

[4.2324]

[4.2408]

        F: FnMut(&mut A, u64, Hash, libpijul::Merkle, bool) -> Result<(), anyhow::Error>,

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

B:BD[6.6079] → [4.2454:2533]

                        super::ListLine::Change { n, m, h } => f(a, n, h, m)?,

[6.6079]

[6.6234]

                        super::ListLine::Change { n, m, h, is_tagged } => f(a, n, h, m, is_tagged)?,

Replacement in pijul/src/commands/protocol.rs at line 140 [5.123281]

∅:D[11.12631] → [5.127893:127975]

B:BD[5.127893] → [5.127893:127975]

                        writeln!(o, "{}.{}.{}", n, h.to_base32(), m.to_base32())?

[11.12631]

[5.127975]

                        if txn.is_tagged(&channel.read().tags, n)? {
                            writeln!(o, "{}.{}.{}.", n, h.to_base32(), m.to_base32())?
                        } else {
                            writeln!(o, "{}.{}.{}", n, h.to_base32(), m.to_base32())?
                        }

Insertion in libpijul/src/pristine/sanakirja.rs at line 1308 [5.531056]

[9.27343]

                        tags: Db::from_page(remote.tags.into()),

Insertion in libpijul/src/pristine/sanakirja.rs at line 1438 [5.531056]

[9.28441]

                            tags: Db::from_page(remote.tags.into()),

Replacement in libpijul/src/pristine/sanakirja.rs at line 1786 [5.531056]
B:BD[5.562292] → [5.562292:562319]
```
        v: (Hash, Merkle),
```
[5.562292]
[12.52484]
```
        v: (Hash, Merkle, bool),
```

Insertion in libpijul/src/pristine/sanakirja.rs at line 1798 [5.531056]

[11.86001]

        if v.2 {
            btree::put(&mut self.txn, &mut remote.tags, &k.into(), &())?;
        }

Insertion in libpijul/src/pristine/sanakirja.rs at line 2070 [5.531056]

[9.30809]

                            tags: Db::from_page(remote.tags.into()),

Insertion in libpijul/src/pristine/sanakirja.rs at line 2082 [5.531056]

[9.30955]

                                tags: btree::create_db(&mut self.txn)?,

Insertion in libpijul/src/pristine/mod.rs at line 121 [5.586748]
[9.34840]
[9.34840]
```
    tags: L64,
```
Insertion in libpijul/src/pristine/mod.rs at line 239 [5.586748]
[9.35369]
[9.35369]
```
    pub tags: T::Tags,
```
Replacement in libpijul/src/pristine/mod.rs at line 1872 [5.586748]
B:BD[5.638332] → [5.638332:638359]
```
        v: (Hash, Merkle),
```
[5.638332]
[12.74624]
```
        v: (Hash, Merkle, bool),
```

Exchanging tagged states over SSH

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Deletion in pijul/src/remote/mod.rs at line 654 [5.52474]

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