dblsaiko/pijul - Change L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC

Downloading changelists from channels without an id (Nest discussions)

Created by pmeunier on July 4, 2021

L2VH4BYK3IULLGBHXMZJWKRKDQY43QEMQRTXFJCNRDE7PODLXWTAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 12 [5.25380]
B:BD[3.66] → [4.6007:6054]
```
use libpijul::{Base32, Hash, Merkle, MutTxnT};
```
[3.66]
[6.0]
```
use libpijul::{Base32, Hash, Merkle};
```
Replacement in pijul/src/remote/ssh.rs at line 18 [5.25380]
B:BD[5.25789] → [7.295:331]
```
use super::{parse_line, RemoteRef};
```
[5.25789]
[7.384]
```
use super::parse_line;
```

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

B:BD[2.1195] → [2.1195:1250]

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

[2.1195]

[2.1250]

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

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

B:BD[2.1308] → [2.1308:1373]

                        let line = if data.last() == Some(&10) {

[2.1308]

[2.1373]

                        let line = if data.len() >= 16 && data.last() == Some(&10) {

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

B:BD[5.42015] → [5.42015:42065]

    pub async fn download_changelist<T: MutTxnT>(

[5.42015]

[5.42065]

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

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

B:BD[5.42084] → [5.42084:42140]

        txn: &mut T,
        remote: &mut RemoteRef<T>,

[5.42084]

[5.42140]

        mut f: F,
        a: &mut A,

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

B:BD[3.528] → [3.528:659]

                super::ListLine::Change { n, h, m } => {
                    txn.put_remote(remote, n, (h, m))?;
                }

[3.528]

[3.659]

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

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

[3.1161]

[5.63752]

        let f = |a: &mut (&mut T, &mut RemoteRef<T>), n, h, m| {
            let (ref mut txn, ref mut remote) = *a;
            txn.put_remote(remote, n, (h, m))?;
            Ok(())
        };

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

B:BD[5.63774] → [5.63774:63964]

B:BD[5.63964] → [3.1162:1256]

            RemoteRepo::Local(ref mut l) => l.download_changelist(txn, remote, from, paths),
            RemoteRepo::Ssh(ref mut s) => s.download_changelist(txn, remote, from, paths).await,
            RemoteRepo::Http(ref h) => h.download_changelist(txn, remote, from, paths).await,

[5.63774]

[3.1256]

            RemoteRepo::Local(ref mut l) => {
                l.download_changelist(f, &mut (txn, remote), from, paths)
            }
            RemoteRepo::Ssh(ref mut s) => {
                s.download_changelist(f, &mut (txn, remote), from, paths)
                    .await
            }
            RemoteRepo::Http(ref h) => {
                h.download_changelist(f, &mut (txn, remote), from, paths)
                    .await
            }

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

B:BD[2.7189] → [2.7189:7221]

    async fn update_identities(

[2.7189]

[2.7221]

    pub async fn update_identities<T: MutTxnTExt + TxnTExt + GraphIter>(

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

B:BD[2.7240] → [2.7240:7327]

        rev: Option<u64>,
        path: PathBuf,
    ) -> Result<u64, anyhow::Error> {

[2.7240]

[2.7327]

        repo: &mut Repository,
        remote: &RemoteRef<T>,
    ) -> Result<(), anyhow::Error> {
        let mut id_path = repo.path.clone();
        id_path.push(DOT_DIR);
        id_path.push("identities");
        let rev = None;

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

B:BD[2.7357] → [2.7357:7603]

            RemoteRepo::Local(ref mut l) => l.update_identities(rev, path).await?,
            RemoteRepo::Ssh(ref mut s) => s.update_identities(rev, path).await?,
            RemoteRepo::Http(ref mut h) => h.update_identities(rev, path).await?,

[2.7357]

[2.7603]

            RemoteRepo::Local(ref mut l) => l.update_identities(rev, id_path).await?,
            RemoteRepo::Ssh(ref mut s) => s.update_identities(rev, id_path).await?,
            RemoteRepo::Http(ref mut h) => h.update_identities(rev, id_path).await?,

Replacement in pijul/src/remote/mod.rs at line 404 [5.52474]
B:BD[2.7708] → [2.7708:7722]
```
        Ok(r)
```
[2.7708]
[5.68729]
```
        remote.set_id_revision(r)?;
        Ok(())
```
Deletion in pijul/src/remote/mod.rs at line 410 [5.52474]
B:BD[8.118] → [2.7723:7754]
```
        remote: &RemoteRef<T>,
```

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

B:BD[2.7799] → [2.7799:7990]

        let mut id_path = repo.path.clone();
        id_path.push(DOT_DIR);
        id_path.push("identities");
        remote.set_id_revision(self.update_identities(None, id_path).await?)?;

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

B:BD[5.74687] → [2.8127:8207]

        self.pull(&remote, repo, txn, channel, &to_pull, &HashSet::new(), true)

[5.74687]

[9.2029]

        self.pull(repo, txn, channel, &to_pull, &HashSet::new(), true)

Insertion in pijul/src/remote/mod.rs at line 616 [5.52474]
[9.2050]
[9.2050]
```
        self.update_identities(repo, &remote).await?;
```

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

B:BD[5.78459] → [2.8410:8609]

        self.pull(
            &remote_changes,
            repo,
            txn,
            local_channel,
            &pullable,
            &inodes,
            true,
        )
        .await?;

[5.78459]

[9.2742]

        self.pull(repo, txn, local_channel, &pullable, &inodes, true)
            .await?;
        self.update_identities(repo, &remote_changes).await?;

Deletion in pijul/src/remote/local.rs at line 9 [5.79745]
B:BD[7.552] → [7.552:575]
```
use super::RemoteRef;
```

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

∅:D[2.8924] → [5.80605:80649]

B:BD[5.80605] → [5.80605:80649]

    pub fn download_changelist<T: MutTxnT>(

[2.8924]

[5.80649]

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

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

B:BD[5.80668] → [5.80668:80724]

        txn: &mut T,
        remote: &mut RemoteRef<T>,

[5.80668]

[5.80724]

        mut f: F,
        a: &mut A,

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

B:BD[2.9387] → [2.9387:9453]

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

[2.9387]

[5.82051]

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

Replacement in pijul/src/remote/http.rs at line 6 [11.10]

B:BD[10.1221] → [3.5014:5100]

use libpijul::pristine::{Base32, MutTxnT, Position};
use libpijul::{Hash, RemoteRef};

[12.11135]

[13.0]

use libpijul::pristine::{Base32, Position};
use libpijul::Hash;

Replacement in pijul/src/remote/http.rs at line 168 [11.10]

B:BD[3.5102] → [3.5102:5152]

    pub async fn download_changelist<T: MutTxnT>(

[3.5102]

[3.5152]

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

Replacement in pijul/src/remote/http.rs at line 173 [11.10]

B:BD[3.5167] → [3.5167:5223]

        txn: &mut T,
        remote: &mut RemoteRef<T>,

[3.5167]

[3.5223]

        mut f: F,
        a: &mut A,

Replacement in pijul/src/remote/http.rs at line 216 [11.10]

B:BD[3.6079] → [3.6079:6234]

                        super::ListLine::Change { n, m, h } => {
                            txn.put_remote(remote, n, (h, m))?;
                        }

[3.6079]

[3.6234]

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

Deletion in pijul/src/commands/pushpull.rs at line 408 [5.111631]
B:BD[3.9951] → [2.15561:15614]
```
                &remote_changes.as_ref().unwrap().1,
```

Insertion in pijul/src/commands/pushpull.rs at line 416 [5.111631]

[3.10154]

        if let Some((_, ref r)) = remote_changes {
            remote.update_identities(&mut repo, r).await?;
        }