pijul/pijul - Change C5B72K2QDXKEOZOYZNYWCX3S5QTFJHDGB6I5KLKZEMIIWFQYHXXQC

Tag transactions (including a massive refactoring of errors)

Created by pmeunier on December 9, 2021

C5B72K2QDXKEOZOYZNYWCX3S5QTFJHDGB6I5KLKZEMIIWFQYHXXQC

Dependencies

In discussions

#428 [TAG, REQUEST] cloning tags

Change contents

Insertion in pijul-macros/src/lib.rs at line 57 [6.445]

[5.178]

[6.2632]

    };
    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())

Replacement in pijul-macros/src/lib.rs at line 65 [6.445]

B:BD[6.2682] → [7.563:696]

        fn #name_get <'txn> (&'txn self, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, TxnErr<Self::#error>> {

[6.2682]

[7.696]

        fn #name_get <'txn> (&'txn self, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, #txnerr<Self::#error>> {

Replacement in pijul-macros/src/lib.rs at line 71 [6.445]

B:BD[7.939] → [7.939:1004]

                    Err(TxnErr(SanakirjaError::PristineCorrupt))

[7.939]

[7.1004]

                    Err(#txnerr(SanakirjaError::PristineCorrupt))

Insertion in pijul-macros/src/lib.rs at line 96 [6.445]

[5.867]

[6.3586]

    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())
    };

Replacement in pijul-macros/src/lib.rs at line 104 [6.445]

B:BD[6.3671] → [7.1037:1194]

        fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, TxnErr<Self::#error>> {

[6.3671]

[7.1194]

        fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, #txnerr<Self::#error>> {

Replacement in pijul-macros/src/lib.rs at line 110 [6.445]

B:BD[7.1428] → [7.1428:1493]

                    Err(TxnErr(SanakirjaError::PristineCorrupt))

[7.1428]

[7.1493]

                    Err(#txnerr(SanakirjaError::PristineCorrupt))

Insertion in pijul-macros/src/lib.rs at line 133 [6.445]

[5.1362]

    };
    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())

Replacement in pijul-macros/src/lib.rs at line 142 [6.445]

B:BD[6.4594] → [7.1512:1642]

        fn #name_get<'txn>(&'txn self, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, TxnErr<Self::#error>>;

[6.4594]

[6.4709]

        fn #name_get<'txn>(&'txn self, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, #txnerr<Self::#error>>;

Insertion in pijul-macros/src/lib.rs at line 164 [6.445]

[5.1678]

[6.5398]

    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())
    };

Replacement in pijul-macros/src/lib.rs at line 172 [6.445]

B:BD[6.5483] → [7.1643:1799]

        fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, TxnErr<Self::#error>>;

[6.5483]

[6.5624]

        fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: &#key, value: Option<&#value>) -> Result<Option<&'txn #value>, #txnerr<Self::#error>>;

Insertion in pijul-macros/src/lib.rs at line 259 [6.445]

[5.2019]

    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())
    };

Replacement in pijul-macros/src/lib.rs at line 268 [6.445]

B:BD[6.8069] → [5.2021:2142]

            Result<crate::pristine::RevCursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, TxnErr<Self::#error>>

[6.8069]

[6.8160]

            Result<crate::pristine::RevCursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, #txnerr<Self::#error>>

Replacement in pijul-macros/src/lib.rs at line 272 [6.445]

B:BD[6.8200] → [5.2143:2261]

            Result<crate::pristine::Cursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, TxnErr<Self::#error>>

[6.8200]

[6.8288]

            Result<crate::pristine::Cursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, #txnerr<Self::#error>>

Replacement in pijul-macros/src/lib.rs at line 283 [6.445]

B:BD[6.8573] → [7.2378:2461]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, TxnErr<Self::#error>>;

[6.8573]

[6.8641]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, #txnerr<Self::#error>>;

Replacement in pijul-macros/src/lib.rs at line 287 [6.445]

B:BD[6.8753] → [7.2462:2545]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, TxnErr<Self::#error>>;

[6.8753]

[6.8794]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, #txnerr<Self::#error>>;

Replacement in pijul-macros/src/lib.rs at line 296 [6.445]

∅:D[7.2597] → [5.2406:2518]

B:BD[6.9053] → [5.2406:2518]

        ) -> Result<crate::pristine::Cursor<Self, RT, Self::#cursor_name, #key, #value>, TxnErr<Self::#error>>;

[7.2597]

[6.9135]

        ) -> Result<crate::pristine::Cursor<Self, RT, Self::#cursor_name, #key, #value>, #txnerr<Self::#error>>;

Insertion in pijul-macros/src/lib.rs at line 381 [6.445]

[6.11795]


    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())
    };

Replacement in pijul-macros/src/lib.rs at line 395 [6.445]

∅:D[7.2773] → [8.0:110]

B:BD[6.12375] → [8.0:110]

            ) -> Result<Cursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, TxnErr<SanakirjaError>> {

[7.2773]

[6.12460]

            ) -> Result<Cursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, #txnerr<SanakirjaError>> {

Replacement in pijul-macros/src/lib.rs at line 409 [6.445]

∅:D[7.2829] → [8.111:213]

B:BD[6.12848] → [8.111:213]

            ) -> Result<Cursor<Self, RT, Self::#cursor_name, #key, #value>, TxnErr<SanakirjaError>> {

[7.2829]

[7.2830]

            ) -> Result<Cursor<Self, RT, Self::#cursor_name, #key, #value>, #txnerr<SanakirjaError>> {

Replacement in pijul-macros/src/lib.rs at line 433 [6.445]

∅:D[7.3317] → [5.3092:3212]

B:BD[6.13495] → [5.3092:3212]

            ) -> Result<super::RevCursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, TxnErr<SanakirjaError>> {

[7.3317]

[7.3318]

            ) -> Result<super::RevCursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, #txnerr<SanakirjaError>> {

Replacement in pijul-macros/src/lib.rs at line 455 [6.445]

∅:D[7.3775] → [8.247:357]

B:BD[6.14294] → [8.247:357]

            ) -> Result<Cursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, TxnErr<SanakirjaError>> {

[7.3775]

[7.3776]

            ) -> Result<Cursor<Self, &'txn Self, Self::#cursor_name, #key, #value>, #txnerr<SanakirjaError>> {

Replacement in pijul-macros/src/lib.rs at line 472 [6.445]

B:BD[6.14808] → [7.4128:4214]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, TxnErr<SanakirjaError>> {

[6.14808]

[7.4214]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, #txnerr<SanakirjaError>> {

Replacement in pijul-macros/src/lib.rs at line 476 [6.445]

B:BD[5.4273] → [5.4273:4345]

                    return Err(TxnErr(SanakirjaError::PristineCorrupt))

[5.4273]

[5.4345]

                    return Err(#txnerr(SanakirjaError::PristineCorrupt))

Replacement in pijul-macros/src/lib.rs at line 483 [6.445]

B:BD[6.15095] → [7.4302:4388]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, TxnErr<SanakirjaError>> {

[6.15095]

[7.4388]

            ) -> Result<Option<(&'txn #key, &'txn #value)>, #txnerr<SanakirjaError>> {

Replacement in pijul-macros/src/lib.rs at line 487 [6.445]

B:BD[5.4603] → [5.4603:4675]

                    return Err(TxnErr(SanakirjaError::PristineCorrupt))

[5.4603]

[5.4675]

                    return Err(#txnerr(SanakirjaError::PristineCorrupt))

Insertion in pijul-macros/src/lib.rs at line 534 [6.445]

[5.5203]

    };
    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())

Replacement in pijul-macros/src/lib.rs at line 548 [6.445]

B:BD[6.16641] → [7.4589:4668]

                type Item = Result<(&'a #key, &'a #value), TxnErr<T::#error>>;

[6.16641]

[5.5422]

                type Item = Result<(&'a #key, &'a #value), #txnerr<T::#error>>;

Replacement in pijul-macros/src/lib.rs at line 563 [6.445]

B:BD[6.17061] → [7.4782:4884]

                pub fn prev(&mut self) -> Option<Result<(&'a #key, &'a #value), TxnErr<T::#error>>> {

[6.17061]

[5.5867]

                pub fn prev(&mut self) -> Option<Result<(&'a #key, &'a #value), #txnerr<T::#error>>> {

Replacement in pijul-macros/src/lib.rs at line 573 [6.445]

B:BD[6.17366] → [7.4995:5074]

                type Item = Result<(&'a #key, &'a #value), TxnErr<T::#error>>;

[6.17366]

[5.6305]

                type Item = Result<(&'a #key, &'a #value), #txnerr<T::#error>>;

Insertion in pijul-macros/src/lib.rs at line 605 [6.445]

[5.6774]

    };
    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())

Replacement in pijul-macros/src/lib.rs at line 619 [6.445]
∅:D[7.5121] → [5.6782:6831]
B:BD[6.18449] → [5.6782:6831]
```
        ) -> Result<bool, TxnErr<Self::#error>>;
```
[7.5121]
[6.18514]
```
        ) -> Result<bool, #txnerr<Self::#error>>;
```
Replacement in pijul-macros/src/lib.rs at line 624 [6.445]
∅:D[7.5176] → [5.6832:6881]
B:BD[6.18606] → [5.6832:6881]
```
        ) -> Result<bool, TxnErr<Self::#error>>;
```
[7.5176]
[6.18648]
```
        ) -> Result<bool, #txnerr<Self::#error>>;
```

Insertion in pijul-macros/src/lib.rs at line 648 [6.445]

[5.7061]

    };
    let txnerr = next(&mut input_iter);
    let txnerr = if txnerr.is_empty() {
        quote! { TxnErr }
    } else {
        proc_macro2::TokenStream::from_iter(txnerr.into_iter())

Replacement in pijul-macros/src/lib.rs at line 662 [6.445]

B:BD[7.5306] → [7.5306:5451]

        ) -> Result<bool, TxnErr<Self::#error>> {
            Ok(::sanakirja::btree::put(&mut self.txn, &mut self.#name, k, v).map_err(TxnErr)?)

[7.5306]

[7.5451]

        ) -> Result<bool, #txnerr<Self::#error>> {
            Ok(::sanakirja::btree::put(&mut self.txn, &mut self.#name, k, v).map_err(#txnerr)?)

Replacement in pijul-macros/src/lib.rs at line 669 [6.445]

B:BD[7.5555] → [7.5555:5700]

        ) -> Result<bool, TxnErr<Self::#error>> {
            Ok(::sanakirja::btree::del(&mut self.txn, &mut self.#name, k, v).map_err(TxnErr)?)

[7.5555]

[7.5700]

        ) -> Result<bool, #txnerr<Self::#error>> {
            Ok(::sanakirja::btree::del(&mut self.txn, &mut self.#name, k, v).map_err(#txnerr)?)

Replacement in libpijul/src/working_copy/filesystem.rs at line 2 [6.208900]

B:BD[6.208970] → [9.653:699]

use crate::pristine::{ArcTxn, InodeMetadata};

[6.208970]

[10.1191]

use crate::pristine::{ArcTxn, GraphTxnT, InodeMetadata, TreeErr, TreeTxnT, TxnErr};

Replacement in libpijul/src/working_copy/filesystem.rs at line 88 [6.208900]
B:BD[11.3277] → [11.3277:3329]
```
pub enum AddError<T: std::error::Error + 'static> {
```
[11.3277]
[11.3329]
```
pub enum AddError<T: GraphTxnT + TreeTxnT> {
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 98 [6.208900]

B:BD[11.3538] → [11.3538:3619]

pub enum Error<C: std::error::Error + 'static, T: std::error::Error + 'static> {

[11.3538]

[11.3619]

pub enum Error<C: std::error::Error + 'static, T: GraphTxnT + TreeTxnT> {

Replacement in libpijul/src/working_copy/filesystem.rs at line 104 [6.208900]

B:BD[12.3046] → [12.3046:3066]

    Txn(#[from] T),

[12.3046]

[12.3066]

    Txn(#[from] TxnErr<T::GraphError>),
    #[error(transparent)]
    Tree(#[from] TreeErr<T::TreeError>),

Replacement in libpijul/src/working_copy/filesystem.rs at line 149 [6.208900]
∅:D[13.1775] → [14.27831:27883]
B:BD[15.398] → [14.27831:27883]
```
    ) -> Result<(), Error<C::Error, T::GraphError>>
```
[13.1775]
[14.27883]
```
    ) -> Result<(), Error<C::Error, T>>
```
Replacement in libpijul/src/working_copy/filesystem.rs at line 187 [6.208900]
∅:D[13.1841] → [5.19632:19679]
B:BD[15.875] → [5.19632:19679]
```
    ) -> Result<(), AddError<T::GraphError>> {
```
[13.1841]
[12.3637]
```
    ) -> Result<(), AddError<T>> {
```
Replacement in libpijul/src/working_copy/filesystem.rs at line 294 [6.208900]
∅:D[13.1968] → [14.28356:28408]
B:BD[15.3130] → [14.28356:28408]
```
    ) -> Result<(), Error<C::Error, T::GraphError>>
```
[13.1968]
[14.28408]
```
    ) -> Result<(), Error<C::Error, T>>
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 303 [6.208900]

B:BD[3.1238] → [3.1238:1294]

                if !txn.read().is_tracked(&path_str)? {

[3.1238]

[3.1294]

                if !crate::fs::is_tracked(&*txn.read(), &path_str)? {

Replacement in libpijul/src/unrecord/working_copy.rs at line 6 [6.225940]
B:BD[16.1] → [5.19820:19847]
B:BD[5.19847] → [5.19847:19924]
B:BD[5.19924] → [5.19924:19927]
```
pub fn undo_file_addition<
    T: GraphMutTxnT + TreeMutTxnT<TreeError = <T as GraphTxnT>::GraphError>,
>(
```
[16.1]
[6.226191]
```
pub fn undo_file_addition<T: TreeMutTxnT>(
```
Replacement in libpijul/src/unrecord/working_copy.rs at line 10 [6.225940]
B:BD[6.226275] → [5.19928:19969]
```
) -> Result<(), TxnErr<T::GraphError>> {
```
[6.226275]
[6.226308]
```
) -> Result<(), TreeErr<T::TreeError>> {
```

Replacement in libpijul/src/unrecord/working_copy.rs at line 23 [6.225940]

B:BD[16.3] → [5.20032:20059]

B:BD[5.20059] → [5.20059:20146]

B:BD[5.20146] → [5.20146:20169]

pub fn undo_file_deletion<
    T: ChannelTxnT + TreeMutTxnT + TreeTxnT<TreeError = <T as GraphTxnT>::GraphError>,
    P: ChangeStore,
>(

[16.3]

[6.226784]

pub fn undo_file_deletion<T: ChannelTxnT + TreeMutTxnT + TreeTxnT, P: ChangeStore>(

Replacement in libpijul/src/unrecord/working_copy.rs at line 30 [6.225940]
∅:D[13.2060] → [5.20170:20234]
B:BD[6.226907] → [5.20170:20234]
```
) -> Result<(), super::UnrecordError<P::Error, T::TreeError>> {
```
[13.2060]
[6.226940]
```
) -> Result<(), super::UnrecordError<P::Error, T>> {
```

Replacement in libpijul/src/unrecord/working_copy.rs at line 43 [6.225940]

B:BD[16.5] → [5.20335:20347]

B:BD[5.20347] → [5.20347:20434]

B:BD[5.20434] → [5.20434:20457]

fn restore<
    T: ChannelTxnT + TreeMutTxnT + TreeTxnT<TreeError = <T as GraphTxnT>::GraphError>,
    P: ChangeStore,
>(

[16.5]

[6.227468]

fn restore<T: ChannelTxnT + TreeMutTxnT + TreeTxnT, P: ChangeStore>(

Replacement in libpijul/src/unrecord/working_copy.rs at line 50 [6.225940]
∅:D[13.2141] → [5.20458:20522]
B:BD[6.227588] → [5.20458:20522]
```
) -> Result<(), super::UnrecordError<P::Error, T::TreeError>> {
```
[13.2141]
[6.227621]
```
) -> Result<(), super::UnrecordError<P::Error, T>> {
```

Replacement in libpijul/src/unrecord/working_copy.rs at line 96 [6.225940]

B:BD[16.9] → [5.20957:20975]

B:BD[5.20975] → [5.20975:21060]

B:BD[5.21060] → [5.21060:21083]

fn restore_inode<
    T: TreeMutTxnT + GraphTxnT + TreeTxnT<TreeError = <T as GraphTxnT>::GraphError>,
    P: ChangeStore,
>(

[16.9]

[6.228969]

fn restore_inode<T: TreeMutTxnT + GraphTxnT + TreeTxnT, P: ChangeStore>(

Replacement in libpijul/src/unrecord/working_copy.rs at line 103 [6.225940]
∅:D[13.2429] → [17.424:499]
B:BD[6.229088] → [17.424:499]
```
) -> Result<Option<Inode>, super::UnrecordError<P::Error, T::TreeError>> {
```
[13.2429]
[6.229174]
```
) -> Result<Option<Inode>, super::UnrecordError<P::Error, T>> {
```
Replacement in libpijul/src/unrecord/working_copy.rs at line 185 [6.225940]
B:BD[6.230916] → [5.21983:22047]
```
) -> Result<(), super::UnrecordError<P::Error, T::TreeError>> {
```
[6.230916]
[6.230949]
```
) -> Result<(), super::UnrecordError<P::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 11 [6.231493]

B:BD[6.231752] → [11.7674:7773]

B:BD[11.7773] → [11.7773:7816]

B:BD[11.7816] → [11.7816:7820]

#[derive(Debug, Error)]
pub enum UnrecordError<
    ChangestoreError: std::error::Error + 'static,
    TxnError: std::error::Error + 'static,
> {

[6.231752]

[11.7820]

#[derive(Error)]
pub enum UnrecordError<ChangestoreError: std::error::Error + 'static, T: GraphTxnT + TreeTxnT> {

Replacement in libpijul/src/unrecord/mod.rs at line 16 [6.231493]

B:BD[11.7920] → [11.7920:7939]

    Txn(TxnError),

[11.7920]

[11.7939]

    Txn(#[from] TxnErr<T::GraphError>),
    #[error(transparent)]
    Tree(#[from] TreeErr<T::TreeError>),

Replacement in libpijul/src/unrecord/mod.rs at line 20 [6.231493]

B:BD[11.7965] → [5.22179:22237]

    Block(#[from] crate::pristine::BlockError<TxnError>),

[11.7965]

[11.8013]

    Block(#[from] crate::pristine::BlockError<T::GraphError>),

Replacement in libpijul/src/unrecord/mod.rs at line 22 [6.231493]

B:BD[11.8039] → [5.22238:22317]

    InconsistentChange(#[from] crate::pristine::InconsistentChange<TxnError>),

[11.8039]

[11.8108]

    InconsistentChange(#[from] crate::pristine::InconsistentChange<T::GraphError>),

Replacement in libpijul/src/unrecord/mod.rs at line 31 [6.231493]

B:BD[11.8352] → [11.8352:8421]

    Missing(#[from] crate::missing_context::MissingError<TxnError>),

[11.8352]

[11.8421]

    Missing(#[from] crate::missing_context::MissingError<T::GraphError>),

Replacement in libpijul/src/unrecord/mod.rs at line 33 [6.231493]

B:BD[11.8447] → [11.8447:8512]

    LocalApply(#[from] crate::apply::LocalApplyError<TxnError>),

[11.8447]

[11.8512]

    LocalApply(#[from] crate::apply::LocalApplyError<T>),

Replacement in libpijul/src/unrecord/mod.rs at line 35 [6.231493]

B:BD[11.8538] → [11.8538:8611]

    Apply(#[from] crate::apply::ApplyError<ChangestoreError, TxnError>),

[11.8538]

[5.22318]

    Apply(#[from] crate::apply::ApplyError<ChangestoreError, T>),

Replacement in libpijul/src/unrecord/mod.rs at line 38 [6.231493]

B:BD[5.22321] → [5.22321:22518]

impl<T: std::error::Error + 'static, C: std::error::Error + 'static> std::convert::From<TxnErr<T>>
    for UnrecordError<C, T>
{
    fn from(t: TxnErr<T>) -> Self {
        UnrecordError::Txn(t.0)

[5.22321]

[5.22518]

impl<C: std::error::Error, T: GraphTxnT + TreeTxnT> std::fmt::Debug for UnrecordError<C, T> {
    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
        match self {
            UnrecordError::Changestore(e) => std::fmt::Debug::fmt(e, fmt),
            UnrecordError::Txn(e) => std::fmt::Debug::fmt(e, fmt),
            UnrecordError::Tree(e) => std::fmt::Debug::fmt(e, fmt),
            UnrecordError::Block(e) => std::fmt::Debug::fmt(e, fmt),
            UnrecordError::InconsistentChange(e) => std::fmt::Debug::fmt(e, fmt),
            UnrecordError::ChangeNotInChannel { hash } => {
                write!(fmt, "Change not in channel: {}", hash.to_base32())
            }
            UnrecordError::ChangeIsDependedUpon {
                change_id,
                dependent,
            } => write!(
                fmt,
                "Change {} is depended upon: {}",
                change_id.to_base32(),
                dependent.to_base32()
            ),
            UnrecordError::Missing(e) => std::fmt::Debug::fmt(e, fmt),
            UnrecordError::LocalApply(e) => std::fmt::Debug::fmt(e, fmt),
            UnrecordError::Apply(e) => std::fmt::Debug::fmt(e, fmt),
        }

Replacement in libpijul/src/unrecord/mod.rs at line 71 [6.231493]
∅:D[13.2521] → [5.22525:22585]
B:BD[6.231881] → [5.22525:22585]
```
) -> Result<bool, UnrecordError<P::Error, T::GraphError>> {
```
[13.2521]
[11.8670]
```
) -> Result<bool, UnrecordError<P::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 103 [6.231493]

B:BD[5.23047] → [5.23047:23123]

    T: ChannelMutTxnT + DepsTxnT<DepsError = <T as GraphTxnT>::GraphError>,

[5.23047]

[5.23123]

    T: ChannelMutTxnT + DepsTxnT<DepsError = <T as GraphTxnT>::GraphError> + TreeTxnT,

Replacement in libpijul/src/unrecord/mod.rs at line 109 [6.231493]
B:BD[6.232905] → [5.23147:23205]
```
) -> Result<(), UnrecordError<P::Error, T::GraphError>> {
```
[6.232905]
[7.16307]
```
) -> Result<(), UnrecordError<P::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 163 [6.231493]
∅:D[13.2606] → [5.23858:23916]
B:BD[6.234187] → [5.23858:23916]
```
) -> Result<(), UnrecordError<C::Error, T::GraphError>> {
```
[13.2606]
[6.234220]
```
) -> Result<(), UnrecordError<C::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 255 [6.231493]

B:BD[6.235980] → [5.24790:24845]

fn unapply_newvertex<T: GraphMutTxnT, C: ChangeStore>(

[6.235980]

[6.236239]

fn unapply_newvertex<T: GraphMutTxnT + TreeTxnT, C: ChangeStore>(

Replacement in libpijul/src/unrecord/mod.rs at line 261 [6.231493]
B:BD[6.236377] → [5.24875:24933]
```
) -> Result<(), UnrecordError<C::Error, T::GraphError>> {
```
[6.236377]
[6.236410]
```
) -> Result<(), UnrecordError<C::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 300 [6.231493]

B:BD[18.1166] → [5.25014:25067]

    fn perform_del<C: ChangeStore, T: GraphMutTxnT>(

[18.1166]

[18.1214]

    fn perform_del<C: ChangeStore, T: GraphMutTxnT + TreeTxnT>(

Replacement in libpijul/src/unrecord/mod.rs at line 305 [6.231493]

B:BD[18.1322] → [5.25101:25163]

    ) -> Result<(), UnrecordError<C::Error, T::GraphError>> {

[18.1322]

[18.1379]

    ) -> Result<(), UnrecordError<C::Error, T>> {

Replacement in libpijul/src/unrecord/mod.rs at line 325 [6.231493]

B:BD[6.238934] → [5.25181:25244]

fn repair_newvertex_contexts<T: GraphMutTxnT, C: ChangeStore>(

[6.238934]

[6.238976]

fn repair_newvertex_contexts<T: GraphMutTxnT + TreeTxnT, C: ChangeStore>(

Replacement in libpijul/src/unrecord/mod.rs at line 330 [6.231493]
B:BD[18.1508] → [5.25274:25332]
```
) -> Result<(), UnrecordError<C::Error, T::GraphError>> {
```
[18.1508]
[6.239080]
```
) -> Result<(), UnrecordError<C::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 380 [6.231493]
B:BD[11.10239] → [5.25474:25525]
```
fn unapply_edges<T: GraphMutTxnT, P: ChangeStore>(
```
[11.10239]
[6.240406]
```
fn unapply_edges<T: GraphMutTxnT + TreeTxnT, P: ChangeStore>(
```
Replacement in libpijul/src/unrecord/mod.rs at line 388 [6.231493]
B:BD[6.240557] → [5.25555:25613]
```
) -> Result<(), UnrecordError<P::Error, T::GraphError>> {
```
[6.240557]
[6.240590]
```
) -> Result<(), UnrecordError<P::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 448 [6.231493]
B:BD[6.241975] → [5.25746:25797]
```
fn must_reintroduce<T: GraphTxnT, C: ChangeStore>(
```
[6.241975]
[6.242021]
```
fn must_reintroduce<T: GraphTxnT + TreeTxnT, C: ChangeStore>(
```
Replacement in libpijul/src/unrecord/mod.rs at line 457 [6.231493]
B:BD[18.1958] → [5.25823:25883]
```
) -> Result<bool, UnrecordError<C::Error, T::GraphError>> {
```
[18.1958]
[6.242203]
```
) -> Result<bool, UnrecordError<C::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 487 [6.231493]
B:BD[6.243264] → [5.26210:26263]
```
fn edge_is_in_channel<T: GraphTxnT, C: ChangeStore>(
```
[6.243264]
[6.243312]
```
fn edge_is_in_channel<T: GraphTxnT + TreeTxnT, C: ChangeStore>(
```
Replacement in libpijul/src/unrecord/mod.rs at line 493 [6.231493]
B:BD[6.243431] → [5.26264:26324]
```
) -> Result<bool, UnrecordError<C::Error, T::GraphError>> {
```
[6.243431]
[6.243466]
```
) -> Result<bool, UnrecordError<C::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 514 [6.231493]
B:BD[6.243938] → [5.26556:26608]
```
fn remove_zombies<T: GraphMutTxnT, C: ChangeStore>(
```
[6.243938]
[6.243969]
```
fn remove_zombies<T: GraphMutTxnT + TreeTxnT, C: ChangeStore>(
```
Replacement in libpijul/src/unrecord/mod.rs at line 520 [6.231493]
B:BD[6.244079] → [5.26638:26696]
```
) -> Result<(), UnrecordError<C::Error, T::GraphError>> {
```
[6.244079]
[6.244208]
```
) -> Result<(), UnrecordError<C::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 575 [6.231493]

B:BD[18.3886] → [5.27056:27114]

fn repair_edges_context<T: GraphMutTxnT, P: ChangeStore>(

[18.3886]

[6.246914]

fn repair_edges_context<T: GraphMutTxnT + TreeTxnT, P: ChangeStore>(

Replacement in libpijul/src/unrecord/mod.rs at line 582 [6.231493]
B:BD[6.247082] → [5.27144:27202]
```
) -> Result<(), UnrecordError<P::Error, T::GraphError>> {
```
[6.247082]
[19.461]
```
) -> Result<(), UnrecordError<P::Error, T>> {
```
Replacement in libpijul/src/tests/unrecord.rs at line 335 [6.248807]
B:BD[9.6130] → [4.50:90]
```
    )?.into_iter().collect::<Vec<_>>();
```
[9.6130]
[6.260719]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```
Replacement in libpijul/src/tests/file_conflicts.rs at line 918 [6.305506]
B:BD[9.40603] → [4.291:331]
```
    )?.into_iter().collect::<Vec<_>>();
```
[9.40603]
[6.335741]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```
Replacement in libpijul/src/tests/file_conflicts.rs at line 966 [6.305506]
B:BD[9.41437] → [4.332:372]
```
    )?.into_iter().collect::<Vec<_>>();
```
[9.41437]
[9.41438]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```
Replacement in libpijul/src/tests/file_conflicts.rs at line 1002 [6.305506]
B:BD[9.41902] → [4.421:461]
```
    )?.into_iter().collect::<Vec<_>>();
```
[9.41902]
[4.461]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```
Insertion in libpijul/src/tag.rs at line 9 [20.6397]
[20.6585]
[20.6585]
```
use std::io::{Seek, SeekFrom};
```
Insertion in libpijul/src/tag.rs at line 12 [20.6397]
[9.96176]
[20.6636]
```
pub mod txn;
```

Replacement in libpijul/src/tag.rs at line 15 [20.6397]

B:BD[20.6637] → [20.6637:6687]

#[derive(Debug, Serialize, Deserialize, Default)]

[20.6637]

[2.0]

#[derive(Debug, Serialize, Deserialize, Default, Clone)]

Replacement in libpijul/src/tag.rs at line 26 [20.6397]

B:BD[20.6841] → [20.6841:6891]

#[derive(Debug, Serialize, Deserialize, Default)]

[20.6841]

[2.184]

#[derive(Debug, Serialize, Deserialize, Default, Clone)]

Insertion in libpijul/src/tag.rs at line 66 [20.6397]

[20.7675]

impl From<TxnErr<SanakirjaError>> for TxnErr<TagError> {
    fn from(e: TxnErr<SanakirjaError>) -> Self {
        TxnErr(TagError::Txn(e.0))
    }
}

Deletion in libpijul/src/tag.rs at line 82 [20.6397]
B:BD[21.1749] → [21.1749:1788]
```
        use std::io::{Seek, SeekFrom};
```