Do not hang on locked repositories

Dependencies

• [2] OUWD436A Version bump
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [4] 3S4DR77Z Version updates
• [5] XWETQ4DE Upgrading versions

Change contents

• replacement in pijul/Cargo.toml at line 63
  [3.197874]→[3.197874:197895](∅→∅)
  − sanakirja = "0.13.1"
  [3.197874]

  [3.197895]
  + sanakirja = "0.14.2"
• replacement in libpijul/src/pristine/sanakirja.rs at line 15
  [3.531446]→[3.531446:531482](∅→∅)
  − pub env: Arc<::sanakirja::Env>,
  [3.531446]

  [3.531482]
  + pub env: Arc<::sanakirja::Env<::sanakirja::Exclusive>>,
• replacement in libpijul/src/pristine/sanakirja.rs at line 26
  [3.531860]→[3.531860:531954](∅→∅)
  − Ok(Pristine {

  − env: Arc::new(sanakirja::Env::new(name, size)?),

  − })
  [3.531860]

  [3.531954]
  + let env = sanakirja::Env::try_new(name, size);

  + match env {

  + Ok(env) => Ok(Pristine { env: Arc::new(env) }),

  + Err(sanakirja::Error::IO(e)) => {

  + if let std::io::ErrorKind::WouldBlock = e.kind() {

  + Err(crate::Error::PristineLocked.into())

  + } else {

  + Err(e.into())

  + }

  + }

  + Err(e) => Err(e.into())

  + }
• replacement in libpijul/src/pristine/sanakirja.rs at line 78
  [3.532869]→[3.532869:532949](∅→∅)
  − fn begin(txn: ::sanakirja::Txn<Arc<::sanakirja::Env>>) -> Option<Txn> {
  [3.532869]

  [3.532949]
  + fn begin(txn: ::sanakirja::Txn<::sanakirja::Exclusive, Arc<::sanakirja::Env<::sanakirja::Exclusive>>>) -> Option<Txn> {
• replacement in libpijul/src/pristine/sanakirja.rs at line 161
  [3.536443]→[3.536443:536591](∅→∅)
  − pub type Txn = GenericTxn<::sanakirja::Txn<Arc<::sanakirja::Env>>>;

  − pub type MutTxn<T> = GenericTxn<::sanakirja::MutTxn<Arc<::sanakirja::Env>, T>>;
  [3.536443]

  [3.536591]
  + pub type Txn = GenericTxn<::sanakirja::Txn<::sanakirja::Exclusive, Arc<::sanakirja::Env<::sanakirja::Exclusive>>>>;

  + pub type MutTxn<T> = GenericTxn<::sanakirja::MutTxn<Arc<::sanakirja::Env<::sanakirja::Exclusive>>, T>>;
• edit in libpijul/src/lib.rs at line 89
  [3.720083]

  [3.720083]
  + #[error("The repository is locked by another process.")]

  + PristineLocked,
• replacement in libpijul/Cargo.toml at line 91
  [3.1022980]→[3.1022980:1023001](∅→∅)
  − sanakirja = "0.13.1"
  [3.1022980]

  [3.1023001]
  + sanakirja = "0.14.2"
• edit in Cargo.lock at line 1028
  [3.1055452]→[3.1055452:1055485](∅→∅),[3.1055485]→[3.788:814](∅→∅),[3.814]→[3.1055511:1055649](∅→∅),[3.1055511]→[3.1055511:1055649](∅→∅),[3.1055649]→[3.815:836](∅→∅),[3.836]→[2.318:527](∅→∅)
  − ]

  −

  − [[package]]

  − name = "libpijul"

  − version = "1.0.0-alpha.2"

  − dependencies = [

  − "anyhow",

  − "bincode",

  − "bitflags",

  − "blake3",

  − "byteorder",

  − "chrono",

  − "curve25519-dalek",

  − "data-encoding",

  − "diffs",

  − "env_logger 0.8.2",

  − "flate2",

  − "ignore",

  − "lazy_static",

  − "log",

  − "lru-cache",

  − "pijul-macros",

  − "rand",

  − "regex",

  − "sanakirja",

  − "serde",

  − "serde_derive",

  − "tar",

  − "tempfile",

  − "thiserror",

  − "tokio",

  − "toml",

  − "zstd-seekable",
• edit in Cargo.lock at line 1033
  [2.586]→[2.586:729](∅→∅)
  − source = "registry+https://github.com/rust-lang/crates.io-index"

  − checksum = "d06308c4f8e9d914542fa4007adb1cb1eb0e8cfb68307aff10eb947d7f7f0c13"
• edit in Cargo.lock at line 1043
  [2.867]

  [3.1055670]
  + "env_logger 0.8.2",
• replacement in Cargo.lock at line 1402
  [3.1064071]→[3.1034:1060](∅→∅)
  − version = "1.0.0-alpha.3"
  [3.1064071]

  [3.1064097]
  + version = "1.0.0-alpha.4"
• replacement in Cargo.lock at line 1419
  [3.1064329]→[2.868:895](∅→∅)
  − "libpijul 1.0.0-alpha.3",
  [3.1064329]

  [3.1064342]
  + "libpijul",
• replacement in Cargo.lock at line 1743
  [3.1072132]→[3.1072132:1072151](∅→∅)
  − version = "0.13.1"
  [3.1072132]

  [3.1072151]
  + version = "0.14.2"
• replacement in Cargo.lock at line 1745
  [3.1072216]→[3.1072216:1072294](∅→∅)
  − checksum = "f32a19c77f82ac8c2c3a3d7a6eb8b3faca7c5f6eb5d8071b2046bf11cd257f9f"
  [3.1072216]

  [3.1072294]
  + checksum = "c6f61fc4bceeaa600a5c9dc6bc90ddf67d1ebc5d1bc21e540f1701aa210ae98a"