laumann/pijul - Change NUAOEIXMKZO5KQWQ3TLQWO3RIXBPJU4QOPW7MGCV3ITDAUHFEK5QC

Adding inode and byte to Local

Created by pmeunier on September 21, 2021

NUAOEIXMKZO5KQWQ3TLQWO3RIXBPJU4QOPW7MGCV3ITDAUHFEK5QC

Dependencies

In channels

main

Change contents

Replacement in "libpijul/src/record.rs" at line 88 [3.488880]

B:BD[3.489987] → [4.1609:1662]

    pub actions: Vec<Hunk<Option<ChangeId>, Local>>,

[3.489987]

[3.490042]

    pub actions: Vec<Hunk<Option<ChangeId>, LocalByte>>,

Insertion in "libpijul/src/record.rs" at line 867 [3.488880]
[3.502914]
[3.502914]
```
                    item.inode,
```

Insertion in "libpijul/src/record.rs" at line 984 [3.488880]

[3.510502]

    }
    pub fn take_updatables(&mut self) -> HashMap<usize, InodeUpdate> {
        std::mem::replace(&mut self.updatables, HashMap::default())
    }
    pub fn into_change<T: ChannelTxnT + DepsTxnT<DepsError = <T as GraphTxnT>::GraphError>>(
        self,
        txn: &T,
        channel: &ChannelRef<T>,
        header: crate::change::ChangeHeader,
    ) -> Result<
        crate::change::LocalChange<
            crate::change::Hunk<Option<Hash>, crate::change::Local>,
            crate::change::Author,
        >,
        TxnErr<T::GraphError>,
    > {
        let actions = self
            .actions
            .into_iter()
            .map(|rec| rec.globalize(txn).unwrap())
            .collect();
        let contents = if let Ok(c) = Arc::try_unwrap(self.contents) {
            c.into_inner()
        } else {
            unreachable!()
        };
        Ok(crate::change::LocalChange::make_change(
            txn,
            &channel,
            actions,
            contents,
            header,
            Vec::new(),
        )?)

Replacement in "libpijul/src/diff/replace.rs" at line 4 [3.779907]

B:BD[3.780074] → [5.0:51]

∅:D[5.51] → [3.780127:780197]

∅:D[4.2023] → [3.780127:780197]

B:BD[3.780127] → [3.780127:780197]

use crate::change::{Atom, Hunk, Local, NewVertex};
use crate::pristine::{ChangeId, ChangePosition, EdgeFlags, Position};

[3.780074]

[6.85602]

use crate::change::{Atom, Hunk, LocalByte, NewVertex};
use crate::pristine::{ChangeId, ChangePosition, EdgeFlags, Position, Inode};

Insertion in "libpijul/src/diff/replace.rs" at line 35 [3.779907]
[3.781023]
[3.781023]
```
        inode: Inode,
```
Replacement in "libpijul/src/diff/replace.rs" at line 111 [3.779907]
∅:D[4.2274] → [3.782892:782919]
∅:D[6.86387] → [3.782892:782919]
B:BD[3.782892] → [3.782892:782919]
```
            local: Local {
```
[6.86387]
[7.65517]
```
            local: LocalByte {
```
Insertion in "libpijul/src/diff/replace.rs" at line 114 [3.779907]
[3.782992]
[2.0]
```
                inode,
```
Insertion in "libpijul/src/diff/mod.rs" at line 131 [3.793247]
[3.794304]
[3.794304]
```
        inode_: Inode,
```
Insertion in "libpijul/src/diff/mod.rs" at line 174 [3.793247]
[3.797085]
[3.797085]
```
                    inode_,
```
Insertion in "libpijul/src/diff/mod.rs" at line 185 [3.793247]
[8.1005]
[8.1005]
```
                    inode_,
```

Replacement in "libpijul/src/diff/delete.rs" at line 6 [3.805350]

B:BD[3.805588] → [5.130:190]

use crate::change::{Atom, EdgeMap, Hunk, Local, NewVertex};

[3.805588]

[3.805650]

use crate::change::{Atom, EdgeMap, Hunk, LocalByte, NewVertex};

Insertion in "libpijul/src/diff/delete.rs" at line 21 [3.805350]
[3.805970]
[3.805970]
```
        inode: Inode,
```

Replacement in "libpijul/src/diff/delete.rs" at line 26 [3.805350]

B:BD[9.46] → [2.59:141]

        self.delete_lines(txn, channel, diff, d, lines_a, lines_b, r, encoding)?;

[9.46]

[3.806121]

        self.delete_lines(txn, channel, diff, d, lines_a, lines_b, inode, r, encoding)?;

Insertion in "libpijul/src/diff/delete.rs" at line 35 [3.805350]
[3.806322]
[3.806322]
```
            inode,
```
Insertion in "libpijul/src/diff/delete.rs" at line 59 [3.805350]
[2.168]
[3.806886]
```
        inode: Inode,
```
Replacement in "libpijul/src/diff/delete.rs" at line 70 [3.805350]
B:BD[3.807223] → [3.807223:807254]
```
                local: Local {
```
[3.807223]
[7.65653]
```
                local: LocalByte {
```
Insertion in "libpijul/src/diff/delete.rs" at line 73 [3.805350]
[3.807373]
[2.169]
```
                    inode,
```
Replacement in "libpijul/src/diff/delete.rs" at line 85 [3.805350]
B:BD[3.808117] → [3.808117:808148]
```
                local: Local {
```
[3.808117]
[7.65694]
```
                local: LocalByte {
```
Insertion in "libpijul/src/diff/delete.rs" at line 88 [3.805350]
[3.808267]
[2.232]
```
                    inode,
```
Insertion in "libpijul/src/diff/delete.rs" at line 235 [3.805350]
[3.812632]
[3.812632]
```
        inode: Inode,
```
Replacement in "libpijul/src/diff/delete.rs" at line 282 [3.805350]
B:BD[3.814259] → [3.814259:814286]
```
            local: Local {
```
[3.814259]
[7.65987]
```
            local: LocalByte {
```
Insertion in "libpijul/src/diff/delete.rs" at line 285 [3.805350]
[3.814383]
[2.295]
```
                inode,
```

Insertion in "libpijul/src/change.rs" at line 677 [3.831311]

[3.851063]

pub struct LocalByte {
    pub path: String,
    pub line: usize,
    pub inode: Inode,
    pub byte: Option<usize>,
}
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

Deletion in "libpijul/src/change.rs" at line 688 [3.831311]
B:BD[3.851125] → [2.549:578]
```
    pub byte: Option<usize>,
```

Replacement in "libpijul/src/change.rs" at line 1105 [3.831311]

B:BD[2.1542] → [2.1542:1598]

    pub fn atom_map<B, E, F: FnMut(A) -> Result<B, E>>(

[2.1542]

[10.121448]

    pub fn atom_map<B, E, Loc, F: FnMut(A) -> Result<B, E>, L: FnMut(Local) -> Loc>(

Replacement in "libpijul/src/change.rs" at line 1108 [3.831311]

B:BD[2.1617] → [2.1617:1658]

    ) -> Result<BaseHunk<B, Local>, E> {

[2.1617]

[10.121541]

        mut l: L,
    ) -> Result<BaseHunk<B, Loc>, E> {

Replacement in "libpijul/src/change.rs" at line 1177 [3.831311]
∅:D[2.2968] → [3.865735:865758]
∅:D[10.122238] → [3.865735:865758]
B:BD[3.865735] → [3.865735:865758]
```
                local,
```
[2.2968]
[8.2175]
```
                local: l(local),
```
Replacement in "libpijul/src/change.rs" at line 1188 [3.831311]
∅:D[2.3129] → [3.866026:866049]
∅:D[10.122345] → [3.866026:866049]
B:BD[3.866026] → [3.866026:866049]
```
                local,
```
[2.3129]
[8.2229]
```
                local: l(local),
```
Replacement in "libpijul/src/change.rs" at line 1193 [3.831311]
∅:D[2.3259] → [3.866200:866223]
∅:D[10.122394] → [3.866200:866223]
B:BD[3.866200] → [3.866200:866223]
```
                local,
```
[2.3259]
[3.866223]
```
                local: l(local),
```
Replacement in "libpijul/src/change.rs" at line 1197 [3.831311]
∅:D[2.3393] → [3.866378:866401]
∅:D[10.122443] → [3.866378:866401]
B:BD[3.866378] → [3.866378:866401]
```
                local,
```
[2.3393]
[3.866401]
```
                local: l(local),
```
Replacement in "libpijul/src/change.rs" at line 1205 [3.831311]
∅:D[2.3518] → [3.866548:866571]
∅:D[10.122492] → [3.866548:866571]
B:BD[3.866548] → [3.866548:866571]
```
                local,
```
[2.3518]
[8.2409]
```
                local: l(local),
```
Replacement in "libpijul/src/change.rs" at line 1212 [3.831311]
B:BD[2.3528] → [2.3528:3572]
```
impl<Local> Hunk<Option<ChangeId>, Local> {
```
[2.3528]
[2.3572]
```
impl Hunk<Option<ChangeId>, LocalByte> {
```

Replacement in "libpijul/src/change.rs" at line 1217 [3.831311]

B:BD[2.3699] → [2.3699:3743]

        self.atom_map(|x| x.globalize(txn))

[2.3699]

[3.866596]

        self.atom_map(
            |x| x.globalize(txn),
            |l| Local { path: l.path, line: l.line }
        )

Deletion in "libpijul/src/change/text_changes.rs" at line 719 [11.37976]
B:BD[11.61420] → [2.3744:3780]
```
                        byte: None,
```
Deletion in "libpijul/src/change/text_changes.rs" at line 738 [11.37976]
B:BD[11.62075] → [2.3781:3817]
```
                        byte: None,
```
Deletion in "libpijul/src/change/text_changes.rs" at line 862 [11.37976]
B:BD[11.66364] → [2.3818:3858]
```
                            byte: None,
```
Deletion in "libpijul/src/change/text_changes.rs" at line 872 [11.37976]
B:BD[11.66801] → [2.3859:3899]
```
                            byte: None,
```
Deletion in "libpijul/src/change/text_changes.rs" at line 889 [11.37976]
B:BD[11.67507] → [2.3900:3936]
```
                        byte: None,
```

Adding inode and byte to Local

Dependencies

In channels

Change contents

Replacement in "libpijul/src/record.rs" at line 88 [3.488880]

Insertion in "libpijul/src/record.rs" at line 867 [3.488880]

Insertion in "libpijul/src/record.rs" at line 984 [3.488880]

Replacement in "libpijul/src/diff/replace.rs" at line 4 [3.779907]

Insertion in "libpijul/src/diff/replace.rs" at line 35 [3.779907]

Replacement in "libpijul/src/diff/replace.rs" at line 111 [3.779907]

Insertion in "libpijul/src/diff/replace.rs" at line 114 [3.779907]

Insertion in "libpijul/src/diff/mod.rs" at line 131 [3.793247]

Insertion in "libpijul/src/diff/mod.rs" at line 174 [3.793247]

Insertion in "libpijul/src/diff/mod.rs" at line 185 [3.793247]

Replacement in "libpijul/src/diff/delete.rs" at line 6 [3.805350]

Insertion in "libpijul/src/diff/delete.rs" at line 21 [3.805350]

Replacement in "libpijul/src/diff/delete.rs" at line 26 [3.805350]

Insertion in "libpijul/src/diff/delete.rs" at line 35 [3.805350]

Insertion in "libpijul/src/diff/delete.rs" at line 59 [3.805350]

Replacement in "libpijul/src/diff/delete.rs" at line 70 [3.805350]

Insertion in "libpijul/src/diff/delete.rs" at line 73 [3.805350]

Replacement in "libpijul/src/diff/delete.rs" at line 85 [3.805350]

Insertion in "libpijul/src/diff/delete.rs" at line 88 [3.805350]

Insertion in "libpijul/src/diff/delete.rs" at line 235 [3.805350]

Replacement in "libpijul/src/diff/delete.rs" at line 282 [3.805350]

Insertion in "libpijul/src/diff/delete.rs" at line 285 [3.805350]

Insertion in "libpijul/src/change.rs" at line 677 [3.831311]

Deletion in "libpijul/src/change.rs" at line 688 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1105 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1108 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1177 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1188 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1193 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1197 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1205 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1212 [3.831311]

Replacement in "libpijul/src/change.rs" at line 1217 [3.831311]

Deletion in "libpijul/src/change/text_changes.rs" at line 719 [11.37976]

Deletion in "libpijul/src/change/text_changes.rs" at line 738 [11.37976]

Deletion in "libpijul/src/change/text_changes.rs" at line 862 [11.37976]

Deletion in "libpijul/src/change/text_changes.rs" at line 872 [11.37976]

Deletion in "libpijul/src/change/text_changes.rs" at line 889 [11.37976]