pijul/pijul - Change WO2UYBSLXMSAM5RBSJC6REE5B7BBQVFCPN43FPQVQYZK5G7TU3HQC

Implement the Sanakirja concurrency model in a cross-process way

Created by pmeunier on January 14, 2021

WO2UYBSLXMSAM5RBSJC6REE5B7BBQVFCPN43FPQVQYZK5G7TU3HQC

Dependencies

Change contents

Insertion in pijul/src/repository.rs at line 7 [8.21431]

[7.39]


#[cfg(not(unix))]
mod basic_lock;
#[cfg(unix)]
mod unix_lock;
mod lock {
    #[cfg(not(unix))]
    pub use super::basic_lock::*;
    #[cfg(unix)]
    pub use super::unix_lock::*;
    use std::path::Path;
    pub enum Lock {
        Txn(TxnLock),
        MutTxn(MutTxnLock),
    }

Insertion in pijul/src/repository.rs at line 24 [8.21431]

[7.40]

[9.7685]

    impl Lock {
        pub async fn mut_txn_lock<P: AsRef<Path>>(p: P) -> Result<Self, anyhow::Error> {
            let pp = p.as_ref().join("db_lock");
            Ok(Lock::MutTxn(mut_txn(&pp).await?))
        }
        pub async fn txn_lock<P: AsRef<Path>>(p: P) -> Result<Self, anyhow::Error> {
            let pp = p.as_ref().join("db_lock");
            Ok(Lock::Txn(txn(&pp).await?))
        }
        pub async fn commit(&mut self) -> Result<(), anyhow::Error> {
            match self {
                Lock::MutTxn(m) => m.commit().await,
                _ => Ok(()),
            }
        }
    }
}

Insertion in pijul/src/repository.rs at line 45 [8.21431]
[8.21565]
[8.21565]
```
    pub lock: lock::Lock,
```

Replacement in pijul/src/repository.rs at line 89 [8.21431]

B:BD[8.22907] → [8.22907:23034]

    pub fn find_root(cur: Option<PathBuf>) -> Result<Self, anyhow::Error> {
        Self::find_root_with_dot_dir(cur, DOT_DIR)

[8.22907]

[8.23034]

    pub async fn find_root(cur: Option<PathBuf>) -> Result<Self, anyhow::Error> {
        Self::find_root_with_dot_dir(cur, DOT_DIR, true).await

Replacement in pijul/src/repository.rs at line 93 [8.21431]

B:BD[8.23041] → [8.23041:23076]

    pub fn find_root_with_dot_dir(

[8.23041]

[8.23076]

    pub async unsafe fn find_root_immutable(cur: Option<PathBuf>) -> Result<Self, anyhow::Error> {
        Self::find_root_with_dot_dir(cur, DOT_DIR, false).await
    }
    pub async fn find_root_with_dot_dir(

Insertion in pijul/src/repository.rs at line 100 [8.21431]
[8.23129]
[8.23129]
```
        mutable: bool,
```

Replacement in pijul/src/repository.rs at line 120 [8.21431]

B:BD[8.23883] → [8.23883:23967]

            pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir)?,

[8.23883]

[8.23967]

            lock: if mutable {
                lock::Lock::mut_txn_lock(&pristine_dir).await?
            } else {
                lock::Lock::txn_lock(&pristine_dir).await?
            },
            pristine: unsafe {
                libpijul::pristine::sanakirja::Pristine::new_nolock(&pristine_dir)?
            },

Replacement in pijul/src/repository.rs at line 138 [8.21431]

B:BD[8.24299] → [8.24299:24382]

    pub fn init(path: Option<std::path::PathBuf>) -> Result<Self, anyhow::Error> {

[8.24299]

[8.24382]

    pub async fn init(path: Option<std::path::PathBuf>) -> Result<Self, anyhow::Error> {

Replacement in pijul/src/repository.rs at line 153 [8.21431]

B:BD[8.24885] → [8.24885:24973]

                pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir)?,

[8.24885]

[8.24973]

                lock: lock::Lock::mut_txn_lock(&pristine_dir).await?,
                pristine: unsafe {
                    libpijul::pristine::sanakirja::Pristine::new_nolock(&pristine_dir)?
                },

File addition: repository (drwxr-xr-x)
[8.21414]

File addition: unix_lock.rs (-rw-r--r--)

[0.1940]

use anyhow::bail;
use std::io::Read;
use std::path::Path;
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::net::UnixStream;
pub struct TxnLock {
    _stream: UnixStream,
}
pub struct MutTxnLock {
    stream: UnixStream,
}
const TXN_BEGIN: u8 = 0;
const MUT_TXN_BEGIN: u8 = 1;
const COMMIT: u8 = 2;
const ACK: u8 = 3;
pub async fn mut_txn<P: AsRef<Path>>(file: P) -> Result<MutTxnLock, anyhow::Error> {
    let cmd = std::env::args().next().unwrap();
    let mut process = std::process::Command::new(&cmd)
        .args(&["lock", file.as_ref().to_str().unwrap()])
        .stdout(std::process::Stdio::piped())
        .spawn()?;
    let s = process.stdout.as_mut().unwrap();
    s.read(&mut [0u8])?;
    let mut stream = UnixStream::connect(file).await?;
    stream.writable().await?;
    stream.write_all(&[MUT_TXN_BEGIN]).await?;
    let mut t = [0u8];
    stream.read_exact(&mut t).await?;
    if t[0] == ACK {
        Ok(MutTxnLock { stream })
    } else {
        bail!("Pristine locked")
    }
}
pub async fn txn<P: AsRef<Path>>(file: P) -> Result<TxnLock, anyhow::Error> {
    let cmd = std::env::args().next().unwrap();
    std::process::Command::new(&cmd)
        .args(&["lock", file.as_ref().to_str().unwrap()])
        .spawn()?;
    let mut stream = UnixStream::connect(file).await?;
    stream.write_all(&[TXN_BEGIN]).await?;
    let mut t = [0u8];
    stream.read_exact(&mut t).await?;
    if t[0] == ACK {
        Ok(TxnLock { _stream: stream })
    } else {
        bail!("Pristine locked")
    }
}
impl MutTxnLock {
    pub async fn commit(&mut self) -> Result<(), anyhow::Error> {
        self.stream.write_all(&[COMMIT]).await?;
        Ok(())
    }
}

File addition: basic_lock.rs (-rw-r--r--)

[0.1940]

use fs2::FileExt;
use std::fs::OpenOptions;
use std::path::Path;
pub struct TxnLock {
    file: std::fs::File,
}
pub struct MutTxnLock {
    file: std::fs::File,
}
pub async fn mut_txn<P: AsRef<Path>>(file: P) -> Result<MutTxnLock, anyhow::Error> {
    let file = OpenOptions::new().write(true).create(true).open(file)?;
    file.lock_exclusive()?;
    Ok(MutTxnLock { file })
}
pub async fn txn<P: AsRef<Path>>(file: P) -> Result<TxnLock, anyhow::Error> {
    let file = OpenOptions::new().write(true).create(true).open(file)?;
    file.lock_shared()?;
    Ok(TxnLock { file })
}
impl MutTxnLock {
    pub async fn commit(&mut self) -> Result<(), anyhow::Error> {
        Ok(self.file.unlock()?)
    }
}
impl Drop for MutTxnLock {
    fn drop(&mut self) {
        self.file.unlock().unwrap_or(())
    }
}
impl Drop for TxnLock {
    fn drop(&mut self) {
        self.file.unlock().unwrap_or(())
    }
}

Insertion in pijul/src/main.rs at line 122 [8.83981]
[8.85778]
[10.25]
```
    #[cfg(unix)]
    Lock(Lock),
```

Replacement in pijul/src/main.rs at line 187 [8.83981]

B:BD[8.88438] → [8.88438:88523]

        SubCommand::Log(l) => l.run(),
        SubCommand::Init(init) => init.run(),

[8.88438]

[8.88523]

        SubCommand::Log(l) => l.run().await,
        SubCommand::Init(init) => init.run().await,

Replacement in pijul/src/main.rs at line 191 [8.83981]

B:BD[8.88636] → [8.88636:88682]

        SubCommand::Diff(diff) => diff.run(),

[8.88636]

[8.88682]

        SubCommand::Diff(diff) => diff.run().await,

Replacement in pijul/src/main.rs at line 194 [8.83981]

B:BD[8.88786] → [8.88786:88951]

        SubCommand::Change(change) => change.run(),
        SubCommand::Channel(channel) => channel.run(),
        SubCommand::Protocol(protocol) => protocol.run(),

[8.88786]

[8.88951]

        SubCommand::Change(change) => change.run().await,
        SubCommand::Channel(channel) => channel.run().await,
        SubCommand::Protocol(protocol) => protocol.run().await,

Replacement in pijul/src/main.rs at line 198 [8.83981]

B:BD[8.88983] → [8.88983:89250]

        SubCommand::Git(git) => git.run(),
        SubCommand::Mv(mv) => mv.run(),
        SubCommand::Ls(ls) => ls.run(),
        SubCommand::Add(add) => add.run(),
        SubCommand::Remove(remove) => remove.run(),
        SubCommand::Reset(reset) => reset.run(),

[8.88983]

[8.89250]

        SubCommand::Git(git) => git.run().await,
        SubCommand::Mv(mv) => mv.run().await,
        SubCommand::Ls(ls) => ls.run().await,
        SubCommand::Add(add) => add.run().await,
        SubCommand::Remove(remove) => remove.run().await,
        SubCommand::Reset(reset) => reset.run().await,

Replacement in pijul/src/main.rs at line 205 [8.83981]

B:BD[8.89283] → [8.89283:89537]

        SubCommand::Debug(debug) => debug.run(),
        SubCommand::Fork(fork) => fork.run(),
        SubCommand::Unrecord(unrecord) => unrecord.run(),
        SubCommand::Apply(apply) => apply.run(),
        SubCommand::Remote(remote) => remote.run(),

[8.89283]

[8.89537]

        SubCommand::Debug(debug) => debug.run().await,
        SubCommand::Fork(fork) => fork.run().await,
        SubCommand::Unrecord(unrecord) => unrecord.run().await,
        SubCommand::Apply(apply) => apply.run().await,
        SubCommand::Remote(remote) => remote.run().await,

Replacement in pijul/src/main.rs at line 211 [8.83981]

B:BD[8.89598] → [8.89598:89650]

        SubCommand::Credit(credit) => credit.run(),

[8.89598]

[10.600]

        SubCommand::Credit(credit) => credit.run().await,
        #[cfg(unix)]
        SubCommand::Lock(lock) => lock.run().await,

Replacement in pijul/src/commands/unrecord.rs at line 35 [8.95630]

B:BD[8.96125] → [8.96125:96177]

B:BD[8.96177] → [11.250:313]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path)?;

[8.96125]

[8.96236]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/unrecord.rs at line 137 [8.95630]
[8.97615]
[8.97615]
```
        repo.lock.commit().await?;
```

Replacement in pijul/src/commands/reset.rs at line 29 [8.97650]

B:BD[8.98112] → [8.98112:98164]

B:BD[8.98164] → [12.447:472]

    pub fn run(self) -> Result<(), anyhow::Error> {
        self.reset(true)

[8.98112]

[12.472]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        self.reset(true).await

Replacement in pijul/src/commands/reset.rs at line 33 [8.97650]

B:BD[12.479] → [12.479:560]

    pub fn switch(self) -> Result<(), anyhow::Error> {
        self.reset(false)

[12.479]

[12.560]

    pub async fn switch(self) -> Result<(), anyhow::Error> {
        self.reset(false).await

Replacement in pijul/src/commands/reset.rs at line 37 [8.97650]

B:BD[12.567] → [12.567:642]

    fn reset(self, overwrite_changes: bool) -> Result<(), anyhow::Error> {

[12.567]

[8.98164]

    async fn reset(self, overwrite_changes: bool) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/reset.rs at line 39 [8.97650]

B:BD[8.98218] → [8.98218:98281]

        let mut repo = Repository::find_root(self.repo_path)?;

[8.98218]

[8.98281]

        let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/reset.rs at line 109 [8.97650]
[13.773]
[13.773]
```
                    repo.lock.commit().await?;
```
Insertion in pijul/src/commands/reset.rs at line 166 [8.97650]
[14.6587]
[14.6587]
```
            repo.lock.commit().await?;
```

Replacement in pijul/src/commands/record.rs at line 59 [8.101759]

B:BD[8.102832] → [8.102832:102903]

        let mut repo = Repository::find_root(self.repo_path.clone())?;

[8.102832]

[8.102903]

        let mut repo = Repository::find_root(self.repo_path.clone()).await?;

Insertion in pijul/src/commands/record.rs at line 156 [8.101759]
[8.105279]
[8.105279]
```
            repo.lock.commit().await?;
```
Insertion in pijul/src/commands/record.rs at line 162 [8.101759]
[15.301]
[5.57]
```
                repo.lock.commit().await?;
```

Replacement in pijul/src/commands/pushpull.rs at line 33 [8.111631]

B:BD[8.112203] → [8.112203:112314]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path)?;

[8.112203]

[8.112314]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/pushpull.rs at line 51 [8.111631]
[8.112970]
[8.112970]
```
                    repo.lock.commit().await?;
```
Replacement in pijul/src/commands/pushpull.rs at line 123 [8.111631]
∅:D[16.1981] → [17.153:212]
B:BD[8.114511] → [17.153:212]
```
        let repo = Repository::find_root(self.repo_path)?;
```
[16.1981]
[8.114570]
```
        let mut repo = Repository::find_root(self.repo_path).await?;
```
Insertion in pijul/src/commands/pushpull.rs at line 268 [8.111631]
[8.117458]
[8.117458]
```
        repo.lock.commit().await?;
```

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

B:BD[8.117585] → [8.117585:117648]

        let mut repo = Repository::find_root(self.repo_path)?;

[8.117585]

[8.117648]

        let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/pushpull.rs at line 476 [8.111631]
[8.121124]
[8.121124]
```
        repo.lock.commit().await?;
```

Replacement in pijul/src/commands/protocol.rs at line 49 [8.123281]

B:BD[8.124762] → [8.124762:124877]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path)?;

[8.124762]

[8.124877]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/protocol.rs at line 250 [8.123281]
[8.133576]
[8.133576]
```
            repo.lock.commit().await?;
```
Insertion in pijul/src/commands/mod.rs at line 59 [8.133619]
[8.134333]
[11.1576]
```
#[cfg(unix)]
mod lock;
#[cfg(unix)]
pub use lock::*;
```

Replacement in pijul/src/commands/log.rs at line 31 [8.134376]

B:BD[8.134895] → [8.134895:135006]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path)?;

[8.134895]

[8.135006]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let repo = unsafe { Repository::find_root_immutable(self.repo_path).await? };

Replacement in pijul/src/commands/init.rs at line 18 [8.136543]

B:BD[8.136770] → [8.136770:136875]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::init(self.path)?;

[8.136770]

[8.136875]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::init(self.path).await?;

Insertion in pijul/src/commands/init.rs at line 28 [8.136543]
[8.137177]
[8.137177]
```
        repo.lock.commit().await?;
```

Replacement in pijul/src/commands/git.rs at line 37 [8.137210]

B:BD[8.138045] → [8.138045:138182]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {

[8.138045]

[8.138182]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let repo = if let Ok(repo) = Repository::find_root(self.repo_path.clone()).await {

Replacement in pijul/src/commands/git.rs at line 41 [8.137210]

B:BD[8.138216] → [8.138216:138270]

            Repository::init(self.repo_path.clone())?

[8.138216]

[8.138270]

            Repository::init(self.repo_path.clone()).await?

Replacement in pijul/src/commands/git.rs at line 65 [8.137210]

B:BD[8.139131] → [8.139131:139185]

        import(&git, &mut env_git, &mut repo, &dag)?;

[8.139131]

[8.139185]

        import(&git, &mut env_git, &mut repo, &dag).await?;

Replacement in pijul/src/commands/git.rs at line 219 [8.137210]
B:BD[8.143830] → [8.143830:143841]
```
fn import(
```
[8.143830]
[8.143841]
```
async fn import(
```
Insertion in pijul/src/commands/git.rs at line 312 [8.137210]
[8.147539]
[8.147539]
```
            repo.repo.lock.commit().await?;
```

Replacement in pijul/src/commands/fork.rs at line 25 [8.167873]

B:BD[8.168309] → [8.168309:168420]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path)?;

[8.168309]

[8.168420]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/fork.rs at line 40 [8.167873]
[8.169013]
[8.169013]
```
        repo.lock.commit().await?;
```

Replacement in pijul/src/commands/file_operations.rs at line 24 [8.169058]

B:BD[8.169351] → [8.169351:169474]

    pub fn run(mut self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path.clone())?;

[8.169351]

[8.169474]

    pub async fn run(mut self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path.clone()).await?;

Insertion in pijul/src/commands/file_operations.rs at line 57 [8.169058]
[8.170571]
[8.170571]
```
        repo.lock.commit().await?;
```

Replacement in pijul/src/commands/file_operations.rs at line 78 [8.169058]

B:BD[8.170860] → [8.170860:170912]

B:BD[8.170912] → [18.394:453]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path)?;

[8.170860]

[8.170979]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let repo = unsafe { Repository::find_root_immutable(self.repo_path).await? };

Replacement in pijul/src/commands/file_operations.rs at line 104 [8.169058]

B:BD[8.171335] → [8.171335:171454]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path.clone())?;

[8.171335]

[8.171454]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path.clone()).await?;

Insertion in pijul/src/commands/file_operations.rs at line 151 [8.169058]
[8.172439]
[8.172439]
```
        repo.lock.commit().await?;
```

Replacement in pijul/src/commands/file_operations.rs at line 166 [8.169058]

B:BD[8.172614] → [8.172614:172733]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path.clone())?;

[8.172614]

[8.172733]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path.clone()).await?;

Insertion in pijul/src/commands/file_operations.rs at line 193 [8.169058]
[8.173517]
[8.173517]
```
        repo.lock.commit().await?;
```

Replacement in pijul/src/commands/diff.rs at line 35 [8.173551]

B:BD[8.174051] → [8.174051:174178]

    pub fn run(mut self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path.clone())?;

[8.174051]

[8.174178]

    pub async fn run(mut self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path.clone()).await?;

Replacement in pijul/src/commands/debug.rs at line 18 [8.177758]

B:BD[8.178019] → [8.178019:178130]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path)?;

[8.178019]

[8.178130]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path).await?;

Replacement in pijul/src/commands/credit.rs at line 26 [8.178684]
B:BD[8.179133] → [8.179133:179185]
```
    pub fn run(self) -> Result<(), anyhow::Error> {
```
[8.179133]
[8.179185]
```
    pub async fn run(self) -> Result<(), anyhow::Error> {
```

Replacement in pijul/src/commands/credit.rs at line 28 [8.178684]

B:BD[8.179239] → [8.179239:179302]

        let mut repo = Repository::find_root(self.repo_path)?;

[8.179239]

[8.179302]

        let mut repo = unsafe { Repository::find_root_immutable(self.repo_path).await? };

Replacement in pijul/src/commands/clone.rs at line 68 [8.182891]

B:BD[19.167] → [4.221:275]

        let mut repo = Repository::init(Some(path))?;

[19.167]

[8.184784]

        let mut repo = Repository::init(Some(path)).await?;

Insertion in pijul/src/commands/clone.rs at line 108 [8.182891]
[8.185801]
[20.2373]
```
        repo.lock.commit().await?;
```
Replacement in pijul/src/commands/channel.rs at line 35 [8.186892]
B:BD[8.187383] → [8.187383:187435]
```
    pub fn run(self) -> Result<(), anyhow::Error> {
```
[8.187383]
[8.187494]
```
    pub async fn run(self) -> Result<(), anyhow::Error> {
```

Replacement in pijul/src/commands/channel.rs at line 39 [8.186892]

B:BD[8.187735] → [12.1000:1067]

                let repo = Repository::find_root(self.repo_path)?;

[8.187735]

[12.1067]

                let repo = Repository::find_root(self.repo_path).await?;

Replacement in pijul/src/commands/channel.rs at line 54 [8.186892]

B:BD[8.188244] → [12.1129:1196]

                let repo = Repository::find_root(self.repo_path)?;

[8.188244]

[12.1196]

                let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/channel.rs at line 64 [8.186892]
[8.188379]
[8.188379]
```
                repo.lock.commit().await?;
```

Replacement in pijul/src/commands/channel.rs at line 73 [8.186892]

B:BD[21.6398] → [21.6398:6426]

                .switch()?;

[21.6398]

[12.1727]

                .switch()
                .await?;

Replacement in pijul/src/commands/channel.rs at line 77 [8.186892]

B:BD[8.188456] → [12.1742:1809]

                let repo = Repository::find_root(self.repo_path)?;

[8.188456]

[12.1809]

                let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/channel.rs at line 94 [8.186892]
[8.189246]
[8.189246]
```
                repo.lock.commit().await?;
```

Replacement in pijul/src/commands/change.rs at line 21 [8.189306]

B:BD[8.189681] → [8.189681:189800]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::find_root(self.repo_path.clone())?;

[8.189681]

[8.189800]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let repo = unsafe { Repository::find_root_immutable(self.repo_path.clone()).await? };

Replacement in pijul/src/commands/archive.rs at line 85 [8.191083]

B:BD[22.8987] → [22.8987:9061]

        if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {

[22.8987]

[8.192979]

        if let Ok(repo) = Repository::find_root(self.repo_path.clone()).await {

Replacement in pijul/src/commands/apply.rs at line 27 [8.194289]

B:BD[8.194761] → [8.194761:194876]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path)?;

[8.194761]

[8.194876]

    pub async fn run(self) -> Result<(), anyhow::Error> {
        let mut repo = Repository::find_root(self.repo_path).await?;

Insertion in pijul/src/commands/apply.rs at line 91 [8.194289]
[8.196337]
[8.196337]
```
        repo.lock.commit().await?;
```
Replacement in pijul/Cargo.toml at line 4 [8.196374]
B:BD[8.196462] → [6.0:27]
```
version = "1.0.0-alpha.32"
```
[8.196462]
[8.196488]
```
version = "1.0.0-alpha.33"
```
Insertion in pijul/Cargo.toml at line 34 [8.196374]
[8.197209]
[8.197209]
```
"src/repository/unix_lock.rs",
"src/repository/basic_lock.rs",
```
Insertion in pijul/Cargo.toml at line 86 [8.196374]
[3.2300]
[23.309]
```
fs2 = "0.4"
```
Replacement in Cargo.lock at line 519 [8.1030385]
B:BD[8.1044908] → [2.465:483]
```
version = "0.3.9"
```
[8.1044908]
[8.1044926]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 521 [8.1030385]

B:BD[8.1044991] → [2.484:562]

checksum = "c70be434c505aee38639abccb918163b63158a4b4bb791b45b7023044bdc3c9c"

[8.1044991]

[8.1045069]

checksum = "309f13e3f4be6d5917178c84db67c0b9a09177ac16d4f9a7313a767a68adaa77"

Replacement in Cargo.lock at line 534 [8.1030385]
B:BD[8.1045250] → [2.563:581]
```
version = "0.3.9"
```
[8.1045250]
[8.1045268]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 536 [8.1030385]

B:BD[8.1045333] → [2.582:660]

checksum = "f01c61843314e95f96cc9245702248733a3a3d744e43e2e755e3c7af8348a0a9"

[8.1045333]

[8.1045411]

checksum = "7a3b03bd32f6ec7885edeb99acd1e47e20e34fd4dfd3c6deed6fcac8a9d28f6a"

Replacement in Cargo.lock at line 544 [8.1030385]
B:BD[8.1045499] → [2.661:679]
```
version = "0.3.9"
```
[8.1045499]
[8.1045517]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 546 [8.1030385]

B:BD[8.1045582] → [2.680:758]

checksum = "db8d3b0917ff63a2a96173133c02818fac4a746b0a57569d3baca9ec0e945e08"

[8.1045582]

[8.1045660]

checksum = "ed8aeae2b6ab243ebabe6f54cd4cf53054d98883d5d326128af7d57a9ca5cd3d"

Replacement in Cargo.lock at line 550 [8.1030385]
B:BD[8.1045699] → [2.759:777]
```
version = "0.3.9"
```
[8.1045699]
[8.1045717]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 552 [8.1030385]

B:BD[8.1045782] → [2.778:856]

checksum = "9ee9ca2f7eb4475772cf39dd1cd06208dce2670ad38f4d9c7262b3e15f127068"

[8.1045782]

[8.1045860]

checksum = "3f7836b36b7533d16fd5937311d98ba8965ab81030de8b0024c299dd5d51fb9b"

Replacement in Cargo.lock at line 561 [8.1030385]
B:BD[8.1045963] → [2.857:875]
```
version = "0.3.9"
```
[8.1045963]
[8.1045981]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 563 [8.1030385]

B:BD[8.1046046] → [2.876:954]

checksum = "e37c1a51b037b80922864b8eed90692c5cd8abd4c71ce49b77146caa47f3253b"

[8.1046046]

[8.1046124]

checksum = "d41234e71d5e8ca73d01563974ef6f50e516d71e18f1a2f1184742e31f5d469f"

Replacement in Cargo.lock at line 567 [8.1030385]
B:BD[8.1046160] → [2.955:973]
```
version = "0.3.9"
```
[8.1046160]
[8.1046178]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 569 [8.1030385]

B:BD[8.1046243] → [2.974:1052]

checksum = "0f8719ca0e1f3c5e34f3efe4570ef2c0610ca6da85ae7990d472e9cbfba13664"

[8.1046243]

[8.1046321]

checksum = "3520e0eb4e704e88d771b92d51273ee212997f0d8282f17f5d8ff1cb39104e42"

Replacement in Cargo.lock at line 579 [8.1030385]
B:BD[8.1046429] → [2.1053:1071]
```
version = "0.3.9"
```
[8.1046429]
[8.1046447]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 581 [8.1030385]

B:BD[8.1046512] → [2.1072:1150]

checksum = "f6adabac1290109cfa089f79192fb6244ad2c3f1cc2281f3e1dd987592b71feb"

[8.1046512]

[8.1046590]

checksum = "c72d188479368953c6c8c7140e40d7a4401674ab3b98a41e60e515d6cbdbe5de"

Replacement in Cargo.lock at line 585 [8.1030385]
B:BD[8.1046625] → [2.1151:1169]
```
version = "0.3.9"
```
[8.1046625]
[8.1046643]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 587 [8.1030385]

B:BD[8.1046708] → [2.1170:1248]

checksum = "a92a0843a2ff66823a8f7c77bffe9a09be2b64e533562c412d63075643ec0038"

[8.1046708]

[8.1046786]

checksum = "08944cea9021170d383287169859c0ca8147d9ec285978393109954448f33cc7"

Replacement in Cargo.lock at line 594 [8.1030385]
B:BD[8.1046854] → [2.1249:1267]
```
version = "0.3.9"
```
[8.1046854]
[8.1046872]
```
version = "0.3.10"
```

Replacement in Cargo.lock at line 596 [8.1030385]

B:BD[8.1046937] → [2.1268:1346]

checksum = "036a2107cdeb57f6d7322f1b6c363dad67cd63ca3b7d1b925bdf75bd5d96cda9"

[8.1046937]

[8.1047015]

checksum = "d3dd206efbe2ca683b2ce138ccdf61e1b0a63f5816dcedc9d8654c500ba0cea6"

Replacement in Cargo.lock at line 778 [8.1030385]
B:BD[8.1051116] → [8.1051116:1051134]
```
version = "2.0.1"
```
[8.1050888]
[8.1051134]
```
version = "2.1.0"
```

Replacement in Cargo.lock at line 780 [8.1030385]

B:BD[8.1051199] → [8.1051199:1051277]

checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"

[8.1051199]

[8.1051277]

checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

Insertion in Cargo.lock at line 1013 [8.1030385]

[8.1056877]

name = "lock"
version = "0.1.0"
dependencies = [
 "tokio",
]
[[package]]

Replacement in Cargo.lock at line 1295 [8.1030385]
B:BD[8.1064071] → [6.2031:2058]
```
version = "1.0.0-alpha.32"
```
[8.1064071]
[8.1064097]
```
version = "1.0.0-alpha.33"
```
Insertion in Cargo.lock at line 1308 [8.1030385]
[24.5827]
[8.1064248]
```
 "fs2",
```
Replacement in Cargo.lock at line 1444 [8.1030385]
B:BD[8.1067251] → [8.1067251:1067269]
```
version = "0.1.6"
```
[8.1067251]
[8.1067269]
```
version = "0.1.7"
```

Replacement in Cargo.lock at line 1446 [8.1030385]

B:BD[8.1067334] → [8.1067334:1067412]

checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"

[8.1067334]

[8.1067412]

checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"

Implement the Sanakirja concurrency model in a cross-process way

Dependencies

Change contents

Insertion in pijul/src/repository.rs at line 7 [8.21431]

Insertion in pijul/src/repository.rs at line 24 [8.21431]

Insertion in pijul/src/repository.rs at line 45 [8.21431]

Replacement in pijul/src/repository.rs at line 89 [8.21431]

Replacement in pijul/src/repository.rs at line 93 [8.21431]

Insertion in pijul/src/repository.rs at line 100 [8.21431]

Replacement in pijul/src/repository.rs at line 120 [8.21431]

Replacement in pijul/src/repository.rs at line 138 [8.21431]

Replacement in pijul/src/repository.rs at line 153 [8.21431]

File addition: repository (drwxr-xr-x)

File addition: unix_lock.rs (-rw-r--r--)

File addition: basic_lock.rs (-rw-r--r--)

Insertion in pijul/src/main.rs at line 122 [8.83981]

Replacement in pijul/src/main.rs at line 187 [8.83981]

Replacement in pijul/src/main.rs at line 191 [8.83981]

Replacement in pijul/src/main.rs at line 194 [8.83981]

Replacement in pijul/src/main.rs at line 198 [8.83981]

Replacement in pijul/src/main.rs at line 205 [8.83981]

Replacement in pijul/src/main.rs at line 211 [8.83981]

Replacement in pijul/src/commands/unrecord.rs at line 35 [8.95630]

Insertion in pijul/src/commands/unrecord.rs at line 137 [8.95630]

Replacement in pijul/src/commands/reset.rs at line 29 [8.97650]

Replacement in pijul/src/commands/reset.rs at line 33 [8.97650]

Replacement in pijul/src/commands/reset.rs at line 37 [8.97650]

Replacement in pijul/src/commands/reset.rs at line 39 [8.97650]

Insertion in pijul/src/commands/reset.rs at line 109 [8.97650]

Insertion in pijul/src/commands/reset.rs at line 166 [8.97650]

Replacement in pijul/src/commands/record.rs at line 59 [8.101759]

Insertion in pijul/src/commands/record.rs at line 156 [8.101759]

Insertion in pijul/src/commands/record.rs at line 162 [8.101759]

Replacement in pijul/src/commands/pushpull.rs at line 33 [8.111631]

Insertion in pijul/src/commands/pushpull.rs at line 51 [8.111631]

Replacement in pijul/src/commands/pushpull.rs at line 123 [8.111631]

Insertion in pijul/src/commands/pushpull.rs at line 268 [8.111631]

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

Insertion in pijul/src/commands/pushpull.rs at line 476 [8.111631]

Replacement in pijul/src/commands/protocol.rs at line 49 [8.123281]

Insertion in pijul/src/commands/protocol.rs at line 250 [8.123281]

Insertion in pijul/src/commands/mod.rs at line 59 [8.133619]

Replacement in pijul/src/commands/log.rs at line 31 [8.134376]

Replacement in pijul/src/commands/init.rs at line 18 [8.136543]

Insertion in pijul/src/commands/init.rs at line 28 [8.136543]

Replacement in pijul/src/commands/git.rs at line 37 [8.137210]

Replacement in pijul/src/commands/git.rs at line 41 [8.137210]

Replacement in pijul/src/commands/git.rs at line 65 [8.137210]

Replacement in pijul/src/commands/git.rs at line 219 [8.137210]

Insertion in pijul/src/commands/git.rs at line 312 [8.137210]

Replacement in pijul/src/commands/fork.rs at line 25 [8.167873]

Insertion in pijul/src/commands/fork.rs at line 40 [8.167873]

Replacement in pijul/src/commands/file_operations.rs at line 24 [8.169058]

Insertion in pijul/src/commands/file_operations.rs at line 57 [8.169058]

Replacement in pijul/src/commands/file_operations.rs at line 78 [8.169058]

Replacement in pijul/src/commands/file_operations.rs at line 104 [8.169058]

Insertion in pijul/src/commands/file_operations.rs at line 151 [8.169058]

Replacement in pijul/src/commands/file_operations.rs at line 166 [8.169058]

Insertion in pijul/src/commands/file_operations.rs at line 193 [8.169058]

Replacement in pijul/src/commands/diff.rs at line 35 [8.173551]

Replacement in pijul/src/commands/debug.rs at line 18 [8.177758]

Replacement in pijul/src/commands/credit.rs at line 26 [8.178684]

Replacement in pijul/src/commands/credit.rs at line 28 [8.178684]

Replacement in pijul/src/commands/clone.rs at line 68 [8.182891]

Insertion in pijul/src/commands/clone.rs at line 108 [8.182891]

Replacement in pijul/src/commands/channel.rs at line 35 [8.186892]

Replacement in pijul/src/commands/channel.rs at line 39 [8.186892]

Replacement in pijul/src/commands/channel.rs at line 54 [8.186892]

Insertion in pijul/src/commands/channel.rs at line 64 [8.186892]

Replacement in pijul/src/commands/channel.rs at line 73 [8.186892]

Replacement in pijul/src/commands/channel.rs at line 77 [8.186892]

Insertion in pijul/src/commands/channel.rs at line 94 [8.186892]

Replacement in pijul/src/commands/change.rs at line 21 [8.189306]

Replacement in pijul/src/commands/archive.rs at line 85 [8.191083]

Replacement in pijul/src/commands/apply.rs at line 27 [8.194289]

Insertion in pijul/src/commands/apply.rs at line 91 [8.194289]

Replacement in pijul/Cargo.toml at line 4 [8.196374]

Insertion in pijul/Cargo.toml at line 34 [8.196374]

Insertion in pijul/Cargo.toml at line 86 [8.196374]

Replacement in Cargo.lock at line 519 [8.1030385]