Chasesomero/pijul - Change AZM7VL5ZYNM2T2QOF2W24SALXGNYOVKNJJ4IQIFCMAWKG4V52IHAC

Support for sub-transactions

This rather big patch adds support for a new feature in Sanakirja called "sub-transactions", which makes it possible to use functions from Libpijul on a temporary state of the repository.

Created by pmeunier on January 13, 2026

AZM7VL5ZYNM2T2QOF2W24SALXGNYOVKNJJ4IQIFCMAWKG4V52IHAC

Dependencies

In channels

main

Change contents

Replacement in pijul-remote/src/lib.rs at line 10 [2.52474]

B:BD[25.582] → [25.582:622]

    RemoteRef, TxnT, sanakirja::MutTxn,

[25.582]

[9.134]

    RemoteRef, TxnT, sanakirja::MutTxn, sanakirja::RawMutTxnT,

Replacement in pijul-remote/src/lib.rs at line 246 [2.52474]

B:BD[9.273] → [18.172:197]

∅:D[18.197] → [9.294:358]

B:BD[9.294] → [9.294:358]

pub fn get_local_inodes(
    txn: &mut MutTxn<()>,
    channel: &ChannelRef<MutTxn<()>>,

[9.273]

[9.358]

pub fn get_local_inodes<T: RawMutTxnT + 'static>(
    txn: &mut MutTxn<T>,
    channel: &ChannelRef<MutTxn<T>>,

Replacement in pijul-remote/src/lib.rs at line 310 [2.52474]
B:BD[9.3294] → [9.3294:3325]
```
impl RemoteDelta<MutTxn<()>> {
```
[9.3294]
[9.3325]
```
impl<T: RawMutTxnT + 'static> RemoteDelta<MutTxn<T>> {
```
Replacement in pijul-remote/src/lib.rs at line 316 [2.52474]
B:BD[9.3521] → [9.3521:3551]
```
        txn: &mut MutTxn<()>,
```
[9.3521]
[9.3551]
```
        txn: &mut MutTxn<T>,
```
Replacement in pijul-remote/src/lib.rs at line 318 [2.52474]
B:BD[9.3576] → [9.3576:3618]
```
        channel: &ChannelRef<MutTxn<()>>,
```
[9.3576]
[9.3618]
```
        channel: &ChannelRef<MutTxn<T>>,
```
Replacement in pijul-remote/src/lib.rs at line 358 [2.52474]
B:BD[9.5192] → [9.5192:5222]
```
        txn: &mut MutTxn<()>,
```
[9.5192]
[9.5222]
```
        txn: &mut MutTxn<T>,
```
Replacement in pijul-remote/src/lib.rs at line 360 [2.52474]
B:BD[9.5247] → [9.5247:5289]
```
        channel: &ChannelRef<MutTxn<()>>,
```
[9.5247]
[9.5289]
```
        channel: &ChannelRef<MutTxn<T>>,
```
Replacement in pijul-remote/src/lib.rs at line 471 [2.52474]
B:BD[9.7643] → [18.336:376]
```
pub fn update_changelist_local_channel(
```
[9.7643]
[9.7690]
```
pub fn update_changelist_local_channel<T: RawMutTxnT + 'static>(
```
Replacement in pijul-remote/src/lib.rs at line 473 [2.52474]
B:BD[9.7716] → [9.7716:7742]
```
    txn: &mut MutTxn<()>,
```
[9.7716]
[9.7742]
```
    txn: &mut MutTxn<T>,
```
Replacement in pijul-remote/src/lib.rs at line 475 [2.52474]
B:BD[9.7763] → [9.7763:7809]
```
    current_channel: &ChannelRef<MutTxn<()>>,
```
[9.7763]
[9.7809]
```
    current_channel: &ChannelRef<MutTxn<T>>,
```

Replacement in pijul-remote/src/lib.rs at line 478 [2.52474]

B:BD[9.7865] → [9.7865:7919]

) -> Result<RemoteDelta<MutTxn<()>>, anyhow::Error> {

[9.7865]

[9.7919]

) -> Result<RemoteDelta<MutTxn<T>>, anyhow::Error> {

Replacement in pijul-remote/src/lib.rs at line 642 [2.52474]

B:BD[14.8976] → [14.8976:9030]

    async fn update_changelist_pushpull_from_scratch(

[14.8976]

[14.9030]

    async fn update_changelist_pushpull_from_scratch<T: RawMutTxnT>(

Replacement in pijul-remote/src/lib.rs at line 644 [2.52474]
B:BD[14.9049] → [14.9049:9079]
```
        txn: &mut MutTxn<()>,
```
[14.9049]
[14.9079]
```
        txn: &mut MutTxn<T>,
```

Replacement in pijul-remote/src/lib.rs at line 646 [2.52474]

B:BD[14.9104] → [14.9104:9212]

        current_channel: &ChannelRef<MutTxn<()>>,
    ) -> Result<RemoteDelta<MutTxn<()>>, anyhow::Error> {

[14.9104]

[14.9212]

        current_channel: &ChannelRef<MutTxn<T>>,
    ) -> Result<RemoteDelta<MutTxn<T>>, anyhow::Error> {

Replacement in pijul-remote/src/lib.rs at line 691 [2.52474]

B:BD[9.10802] → [18.377:422]

    pub async fn update_changelist_pushpull(

[9.10802]

[9.10854]

    pub async fn update_changelist_pushpull<T: RawMutTxnT + 'static>(

Replacement in pijul-remote/src/lib.rs at line 693 [2.52474]
B:BD[9.10873] → [9.10873:10903]
```
        txn: &mut MutTxn<()>,
```
[9.10873]
[9.10903]
```
        txn: &mut MutTxn<T>,
```

Replacement in pijul-remote/src/lib.rs at line 695 [2.52474]

B:BD[9.10928] → [9.10928:10978]

        current_channel: &ChannelRef<MutTxn<()>>,

[9.10928]

[9.10978]

        current_channel: &ChannelRef<MutTxn<T>>,

Replacement in pijul-remote/src/lib.rs at line 700 [2.52474]
∅:D[14.10428] → [9.11077:11135]
B:BD[9.11077] → [9.11077:11135]
```
    ) -> Result<RemoteDelta<MutTxn<()>>, anyhow::Error> {
```
[15.23]
[10.403]
```
    ) -> Result<RemoteDelta<MutTxn<T>>, anyhow::Error> {
```
Replacement in pijul-remote/Cargo.toml at line 15 [18.565]
B:BD[18.889] → [21.149:175]
```
libpijul.workspace = true
```
[18.889]
[21.175]
```
libpijul = { workspace = true, features = [ "tarball" ] }
```

Replacement in pijul/src/commands/reset.rs at line 11 [2.97650]

B:BD[28.79] → [29.114:195]

use libpijul::pristine::{ChangeId, ChannelMutTxnT, Position, sanakirja::MutTxn};

[28.79]

[29.195]

use libpijul::pristine::{
    ChangeId, ChannelMutTxnT, Position,
    sanakirja::{MutTxn, RawMutTxnT},
};

Replacement in pijul/src/commands/reset.rs at line 290 [2.97650]

B:BD[19.474] → [20.142:235]

fn has_unrecorded_changes(
    txn: ArcTxn<MutTxn<()>>,
    channel: ChannelRef<MutTxn<()>>,

[19.474]

[20.235]

fn has_unrecorded_changes<T: RawMutTxnT + Sync + 'static>(
    txn: ArcTxn<MutTxn<T>>,
    channel: ChannelRef<MutTxn<T>>,

Replacement in pijul/src/commands/record.rs at line 146 [2.101759]

B:BD[11.20] → [11.20:108]

            .apply_root_change_if_needed(&repo.changes, &channel, rand::thread_rng())?;

[11.20]

[11.108]

            .apply_root_change_if_needed(&repo.changes, &channel, rand::rng())?;

Replacement in pijul/src/commands/pushpull.rs at line 15 [2.111631]
B:BD[26.34] → [29.570:613]
```
use libpijul::pristine::sanakirja::MutTxn;
```
[26.34]
[4.12857]
```
use libpijul::pristine::sanakirja::{MutTxn, RawMutTxnT};
```
Replacement in pijul/src/commands/pushpull.rs at line 301 [2.111631]
B:BD[26.1485] → [27.8134:8167]
```
                fn flood_delete(
```
[26.1485]
[27.8167]
```
                fn flood_delete<T: RawMutTxnT>(
```

Replacement in pijul/src/commands/pushpull.rs at line 306 [2.111631]

B:BD[27.8312] → [27.8312:8354]

                    txn: &mut MutTxn<()>,

[27.8312]

[27.8354]

                    txn: &mut MutTxn<T>,

Replacement in pijul/src/commands/pushpull.rs at line 471 [2.111631]
B:BD[9.19162] → [9.19162:19186]
```
    async fn to_upload(
```
[9.19162]
[9.19186]
```
    async fn to_upload<T: RawMutTxnT + 'static>(
```

Replacement in pijul/src/commands/pushpull.rs at line 473 [2.111631]

B:BD[9.19201] → [9.19201:19277]

        txn: &mut MutTxn<()>,
        channel: &mut ChannelRef<MutTxn<()>>,

[9.19201]

[9.19277]

        txn: &mut MutTxn<T>,
        channel: &mut ChannelRef<MutTxn<T>>,

Replacement in pijul/src/commands/pushpull.rs at line 648 [2.111631]
B:BD[9.20806] → [9.20806:20832]
```
    async fn to_download(
```
[9.20806]
[9.20832]
```
    async fn to_download<T: RawMutTxnT + 'static>(
```

Replacement in pijul/src/commands/pushpull.rs at line 650 [2.111631]

B:BD[9.20847] → [9.20847:20923]

        txn: &mut MutTxn<()>,
        channel: &mut ChannelRef<MutTxn<()>>,

[9.20847]

[9.20923]

        txn: &mut MutTxn<T>,
        channel: &mut ChannelRef<MutTxn<T>>,

Replacement in pijul/src/commands/pushpull.rs at line 654 [2.111631]
∅:D[14.28443] → [9.20987:21045]
B:BD[9.20987] → [9.20987:21045]
```
    ) -> Result<RemoteDelta<MutTxn<()>>, anyhow::Error> {
```
[9.20987]
[9.21045]
```
    ) -> Result<RemoteDelta<MutTxn<T>>, anyhow::Error> {
```

Replacement in pijul/src/commands/protocol.rs at line 298 [2.123281]

B:BD[2.132020] → [2.132020:132164]

                        let fork_name: String = rand::thread_rng()
                            .sample_iter(&rand::distributions::Alphanumeric)

[2.132020]

[2.132164]

                        let fork_name: String = rand::rng()
                            .sample_iter(&rand::distr::Alphanumeric)

Replacement in pijul/src/commands/apply.rs at line 49 [2.194289]

B:BD[16.153] → [16.153:272]

            let forked_s: String = rand::thread_rng()
                .sample_iter(&rand::distributions::Alphanumeric)

[16.153]

[16.272]

            let forked_s: String = rand::rng()
                .sample_iter(&rand::distr::Alphanumeric)

Replacement in libpijul/src/unrecord/mod.rs at line 318 [2.231493]

B:BD[30.5175] → [30.5175:5313]

                    working_copy
                        .touch(&name, now)
                        .map_err(UnrecordError::WorkingCopy)?

[30.5175]

[30.5313]

                    working_copy.touch(&name, now).unwrap_or(())

Insertion in libpijul/src/tests/conflict.rs at line 1282 [2.357372]

[2.394418]

    crate::pristine::debug(
        &*txn.read(),
        &*channel_alice.read(),
        std::fs::File::create("alice.dot").unwrap(),
    )?;

Insertion in libpijul/src/tests/conflict.rs at line 1306 [2.357372]

[8.63059]

[2.394986]


    crate::pristine::debug(
        &*txn.read(),
        &*channel_bob.read(),
        std::fs::File::create("bob.dot").unwrap(),
    )?;

Replacement in libpijul/src/pristine/sanakirja.rs at line 174 [2.531056]

B:BD[2.534125] → [8.98445:98525]

    pub fn arc_txn_begin(&self) -> Result<ArcTxn<MutTxn<()>>, SanakirjaError> {

[2.534125]

[8.98525]

    pub fn arc_txn_begin(
        &self,
    ) -> Result<ArcTxn<MutTxn<::sanakirja::MutTxn<Arc<::sanakirja::Env>>>>, SanakirjaError> {

Replacement in libpijul/src/pristine/sanakirja.rs at line 180 [2.531056]

∅:D[8.98597] → [7.22355:22427]

B:BD[2.534125] → [7.22355:22427]

    pub fn mut_txn_begin(&self) -> Result<MutTxn<()>, SanakirjaError> {

[8.98597]

[17.12499]

    pub fn mut_txn_begin(
        &self,
    ) -> Result<MutTxn<::sanakirja::MutTxn<Arc<::sanakirja::Env>>>, SanakirjaError> {

Replacement in libpijul/src/pristine/sanakirja.rs at line 269 [2.531056]

B:BD[6.59992] → [6.59992:60072]

pub type MutTxn<T> = GenericTxn<::sanakirja::MutTxn<Arc<::sanakirja::Env>, T>>;

[6.59992]

[2.536591]

pub type MutTxn<T> = GenericTxn<T>;
pub type MutTxn0 = GenericTxn<::sanakirja::MutTxn<Arc<::sanakirja::Env>>>;
pub trait RawMutTxnT:
    ::sanakirja::AllocPage<Error = ::sanakirja::Error>
    + ::sanakirja::RootPageMut
    + ::sanakirja::Commit
    + ::sanakirja::LoadPage<Error = ::sanakirja::Error>
{
}
impl<
        T: ::sanakirja::AllocPage<Error = ::sanakirja::Error>
            + ::sanakirja::RootPageMut
            + ::sanakirja::Commit
            + ::sanakirja::LoadPage<Error = ::sanakirja::Error>,
    > RawMutTxnT for T
{
}

Replacement in libpijul/src/pristine/sanakirja.rs at line 1650 [2.531056]

B:BD[2.558873] → [4.49977:50012]

impl GraphMutTxnT for MutTxn<()> {

[2.558873]

[2.558892]

impl<
        T: sanakirja::AllocPage<Error = ::sanakirja::Error>
            + sanakirja::RootPage
            + sanakirja::LoadPage<Error = ::sanakirja::Error>,
    > GraphMutTxnT for MutTxn<T>
{

Replacement in libpijul/src/pristine/sanakirja.rs at line 1760 [2.531056]

B:BD[2.559395] → [4.50242:50279]

impl ChannelMutTxnT for MutTxn<()> {

[2.559395]

[5.47629]

impl<
        T: sanakirja::AllocPage<Error = ::sanakirja::Error>
            + sanakirja::RootPage
            + sanakirja::LoadPage<Error = ::sanakirja::Error>,
    > ChannelMutTxnT for MutTxn<T>
{

Replacement in libpijul/src/pristine/sanakirja.rs at line 1906 [2.531056]

B:BD[4.50939] → [13.2610:2652]

fn replay_tags(
    txn: &mut MutTxn<()>,

[4.50939]

[13.2652]

fn replay_tags<
    T: sanakirja::AllocPage<Error = ::sanakirja::Error>
        + sanakirja::RootPage
        + sanakirja::LoadPage<Error = ::sanakirja::Error>,
>(
    txn: &mut MutTxn<T>,

Replacement in libpijul/src/pristine/sanakirja.rs at line 1942 [2.531056]

∅:D[13.3541] → [4.50939:50973]

B:BD[4.50939] → [4.50939:50973]

impl DepsMutTxnT for MutTxn<()> {

[13.3541]

[4.50973]

impl<
        T: sanakirja::AllocPage<Error = ::sanakirja::Error>
            + sanakirja::RootPage
            + sanakirja::LoadPage<Error = ::sanakirja::Error>,
    > DepsMutTxnT for MutTxn<T>
{

Replacement in libpijul/src/pristine/sanakirja.rs at line 1954 [2.531056]

B:BD[4.51263] → [4.51263:51297]

impl TreeMutTxnT for MutTxn<()> {

[4.51263]

[12.20216]

impl<
        T: sanakirja::AllocPage<Error = ::sanakirja::Error>
            + sanakirja::RootPageMut
            + sanakirja::LoadPage<Error = ::sanakirja::Error>,
    > TreeMutTxnT for MutTxn<T>
{

Replacement in libpijul/src/pristine/sanakirja.rs at line 1985 [2.531056]
B:BD[4.52453] → [4.52453:52483]
```
impl MutTxnT for MutTxn<()> {
```
[4.52453]
[2.562200]
```
impl<T: RawMutTxnT> MutTxnT for MutTxn<T> {
```

Replacement in libpijul/src/pristine/sanakirja.rs at line 2432 [2.531056]

B:BD[2.572764] → [2.572764:572784]

impl<T> MutTxn<T> {

[2.572764]

[3.16532]

impl<
        T: sanakirja::AllocPage<Error = ::sanakirja::Error>
            + sanakirja::RootPage
            + sanakirja::LoadPage<Error = ::sanakirja::Error>,
    > MutTxn<T>
{

Replacement in Cargo.toml at line 92 [2.1030188]

∅:D[24.183] → [23.453:533]

B:BD[21.7405] → [23.453:533]

sanakirja = { version = "1.4", default-features = false, features = ["crc32"] }

[24.183]

[22.275]

sanakirja = { version = "2.0.0-beta", default-features = false, features = ["crc32"] }

Replacement in Cargo.lock at line 2764 [2.1030385]
B:BD[31.68481] → [31.68481:68499]
```
version = "1.4.3"
```
[31.68481]
[31.68499]
```
version = "2.0.0-beta"
```

Replacement in Cargo.lock at line 2766 [2.1030385]

B:BD[31.68564] → [31.68564:68642]

checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"

[31.68564]

[31.68642]

checksum = "4fc53a1e7a19d27c070749c0d2717427d1612c9b100274b205dbb438e605e34a"

Support for sub-transactions

Dependencies

In channels

Change contents

Replacement in pijul-remote/src/lib.rs at line 10 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 246 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 310 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 316 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 318 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 358 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 360 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 471 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 473 [2.52474]

Replacement in pijul-remote/src/lib.rs at line 475 [2.52474]