mx00s/pijul - Change CBVGAARCMKJ2EARAQCVSPKMB43NATIYEY76BOQJLN7MXDUQVSJBAC

Slightly more generic libpijul::change::Hunk

Created by pmeunier on September 15, 2021

CBVGAARCMKJ2EARAQCVSPKMB43NATIYEY76BOQJLN7MXDUQVSJBAC

Dependencies

In channels

main

Change contents

Insertion in "libpijul/src/diff/replace.rs" at line 113 [3.779907]
[3.782992]
[3.782992]
```
                byte: Some(bytes_pos(lines_b, from_new)),
```

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

B:BD[4.46] → [2.3791:3864]

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

[4.46]

[3.806121]

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

Insertion in "libpijul/src/diff/delete.rs" at line 56 [3.805350]
[3.806886]
[3.806886]
```
        lines_b: &[Line],
```

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

[3.807373]

                    byte: Some(bytes_pos(lines_b, d[r].new)),

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

[3.808267]

                    byte: Some(bytes_pos(lines_b, d[r].new)),

Insertion in "libpijul/src/diff/delete.rs" at line 279 [3.805350]
[3.814383]
[3.814383]
```
                byte: Some(bytes_pos(lines_b, new)),
```

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

[3.844784]

impl<A> Atom<A> {
    pub fn as_newvertex(&self) -> &NewVertex<A> {
        if let Atom::NewVertex(n) = self {
            n
        } else {
            panic!("Not a NewVertex")
        }
    }
}

Insertion in "libpijul/src/change.rs" at line 680 [3.831311]
[3.851125]
[3.851125]
```
    pub byte: Option<usize>,
```
Insertion in "libpijul/src/change.rs" at line 682 [3.831311]
[3.851127]
[3.851127]
```
pub type Hunk<Hash, Local> = BaseHunk<Atom<Hash>, Local>;
```
Replacement in "libpijul/src/change.rs" at line 686 [3.831311]
B:BD[3.851191] → [5.3719:3748]
```
pub enum Hunk<Hash, Local> {
```
[3.851191]
[3.851222]
```
pub enum BaseHunk<Atom, Local> {
```
Replacement in "libpijul/src/change.rs" at line 688 [3.831311]
B:BD[3.851237] → [3.851237:851287]
```
        del: Atom<Hash>,
        add: Atom<Hash>,
```
[3.851237]
[3.851287]
```
        del: Atom,
        add: Atom,
```

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

B:BD[3.851330] → [3.851330:851393]

        del: Atom<Hash>,
        contents: Option<Atom<Hash>>,

[3.851330]

[3.851393]

        del: Atom,
        contents: Option<Atom>,

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

B:BD[3.851438] → [3.851438:851503]

        undel: Atom<Hash>,
        contents: Option<Atom<Hash>>,

[3.851438]

[3.851503]

        undel: Atom,
        contents: Option<Atom>,

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

B:BD[3.851546] → [3.851546:851645]

        add_name: Atom<Hash>,
        add_inode: Atom<Hash>,
        contents: Option<Atom<Hash>>,

[3.851546]

[3.851645]

        add_name: Atom,
        add_inode: Atom,
        contents: Option<Atom>,

Replacement in "libpijul/src/change.rs" at line 712 [3.831311]
B:BD[3.851698] → [3.851698:851724]
```
        name: Atom<Hash>,
```
[3.851698]
[3.851724]
```
        name: Atom,
```
Replacement in "libpijul/src/change.rs" at line 716 [3.831311]
B:BD[3.851779] → [3.851779:851805]
```
        name: Atom<Hash>,
```
[3.851779]
[3.851805]
```
        name: Atom,
```
Replacement in "libpijul/src/change.rs" at line 720 [3.831311]
B:BD[3.851845] → [3.851845:851873]
```
        change: Atom<Hash>,
```
[3.851845]
[3.851873]
```
        change: Atom,
```

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

B:BD[3.851920] → [3.851920:851981]

        change: Atom<Hash>,
        replacement: Atom<Hash>,

[3.851920]

[3.851981]

        change: Atom,
        replacement: Atom,

Replacement in "libpijul/src/change.rs" at line 731 [3.831311]
B:BD[3.852035] → [3.852035:852063]
```
        change: Atom<Hash>,
```
[3.852035]
[3.852063]
```
        change: Atom,
```
Replacement in "libpijul/src/change.rs" at line 735 [3.831311]
B:BD[3.852119] → [3.852119:852147]
```
        change: Atom<Hash>,
```
[3.852119]
[3.852147]
```
        change: Atom,
```
Replacement in "libpijul/src/change.rs" at line 739 [3.831311]
B:BD[3.852199] → [3.852199:852227]
```
        change: Atom<Hash>,
```
[3.852199]
[3.852227]
```
        change: Atom,
```

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

[5.6366]

[3.862693]

    pub fn local(&self) -> Option<&Local> {
        match self {
            Hunk::Edit { ref local, .. }
            | Hunk::Replacement { ref local, .. }
            | Hunk::SolveOrderConflict { ref local, .. }
            | Hunk::UnsolveOrderConflict { ref local, .. }
            | Hunk::ResurrectZombies { ref local, .. } => Some(local),
            _ => None,
        }
    }

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

B:BD[3.863408] → [3.863408:863429]

B:BD[3.863429] → [5.6948:7473]

∅:D[5.7473] → [3.863976:863986]

B:BD[3.863976] → [3.863976:863986]

        match self {
            Hunk::FileMove { .. }
            | Hunk::FileDel { .. }
            | Hunk::FileUndel { .. }
            | Hunk::SolveNameConflict { .. }
            | Hunk::UnsolveNameConflict { .. }
            | Hunk::FileAdd { .. } => None,
            Hunk::Edit { ref local, .. }
            | Hunk::Replacement { ref local, .. }
            | Hunk::SolveOrderConflict { ref local, .. }
            | Hunk::UnsolveOrderConflict { ref local, .. }
            | Hunk::ResurrectZombies { ref local, .. } => Some(local.line),
        }

[3.863408]

[3.863986]

        self.local().map(|x| x.line)

Replacement in "libpijul/src/change.rs" at line 1097 [3.831311]
B:BD[3.863995] → [5.7474:7518]
∅:D[5.7518] → [6.121412:121448]
B:BD[3.864041] → [6.121412:121448]
```
impl<Local> Hunk<Option<ChangeId>, Local> {
    pub fn globalize<T: GraphTxnT>(
```
[3.863995]
[6.121448]
```
impl<A, Local> BaseHunk<A, Local> {
    pub fn atom_map<B, E, F: FnMut(A) -> Result<B, E>>(
```

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

B:BD[6.121462] → [6.121462:121479]

B:BD[6.121479] → [5.7519:7579]

        txn: &T,
    ) -> Result<Hunk<Option<Hash>, Local>, T::GraphError> {

[6.121462]

[6.121541]

        mut f: F,
    ) -> Result<BaseHunk<B, Local>, E> {

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

B:BD[6.121565] → [5.7580:7646]

∅:D[5.7646] → [6.121566:121650]

B:BD[3.864210] → [6.121566:121650]

            Hunk::FileMove { del, add, path } => Hunk::FileMove {
                del: del.globalize(txn)?,
                add: add.globalize(txn)?,

[6.121565]

[3.864292]

            BaseHunk::FileMove { del, add, path } => BaseHunk::FileMove {
                del: f(del)?,
                add: f(add)?,

Replacement in "libpijul/src/change.rs" at line 1108 [3.831311]
B:BD[3.864329] → [5.7647:7675]
```
            Hunk::FileDel {
```
[3.864329]
[3.864359]
```
            BaseHunk::FileDel {
```

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

∅:D[7.4688] → [5.7676:7709]

B:BD[3.864428] → [5.7676:7709]

∅:D[5.7709] → [6.121651:121777]

B:BD[3.864463] → [6.121651:121777]

            } => Hunk::FileDel {
                del: del.globalize(txn)?,
                contents: contents.as_ref().map(|del| del.globalize(txn).unwrap()),

[7.4688]

[3.864579]

            } => BaseHunk::FileDel {
                del: f(del)?,
                contents: if let Some(c) = contents {
                    Some(f(c)?)
                } else {
                    None
                },

Replacement in "libpijul/src/change.rs" at line 1123 [3.831311]
B:BD[3.864616] → [5.7710:7740]
```
            Hunk::FileUndel {
```
[3.864616]
[3.864648]
```
            BaseHunk::FileUndel {
```

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

∅:D[7.4742] → [5.7741:7776]

B:BD[3.864719] → [5.7741:7776]

∅:D[5.7776] → [6.121778:121908]

B:BD[3.864756] → [6.121778:121908]

            } => Hunk::FileUndel {
                undel: undel.globalize(txn)?,
                contents: contents.as_ref().map(|del| del.globalize(txn).unwrap()),

[7.4742]

[3.864876]

            } => BaseHunk::FileUndel {
                undel: f(undel)?,
                contents: if let Some(c) = contents {
                    Some(f(c)?)
                } else {
                    None
                },

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

B:BD[3.864913] → [5.7777:7857]

∅:D[5.7857] → [6.121909:121953]

B:BD[3.864997] → [6.121909:121953]

            Hunk::SolveNameConflict { name, path } => Hunk::SolveNameConflict {
                name: name.globalize(txn)?,

[3.864913]

[3.865040]

            BaseHunk::SolveNameConflict { name, path } => BaseHunk::SolveNameConflict {
                name: f(name)?,

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

B:BD[3.865077] → [5.7858:7942]

∅:D[5.7942] → [6.121954:121998]

B:BD[3.865165] → [6.121954:121998]

            Hunk::UnsolveNameConflict { name, path } => Hunk::UnsolveNameConflict {
                name: name.globalize(txn)?,

[3.865077]

[3.865208]

            BaseHunk::UnsolveNameConflict { name, path } => BaseHunk::UnsolveNameConflict {
                name: f(name)?,

Replacement in "libpijul/src/change.rs" at line 1146 [3.831311]
B:BD[3.865245] → [5.7943:7971]
```
            Hunk::FileAdd {
```
[3.865245]
[3.865275]
```
            BaseHunk::FileAdd {
```

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

∅:D[8.1176] → [5.7972:8005]

B:BD[3.865376] → [5.7972:8005]

∅:D[5.8005] → [6.121999:122189]

B:BD[3.865411] → [6.121999:122189]

            } => Hunk::FileAdd {
                add_name: add_name.globalize(txn)?,
                add_inode: add_inode.globalize(txn)?,
                contents: contents.as_ref().map(|add| add.globalize(txn).unwrap()),

[8.1176]

[3.865590]

            } => BaseHunk::FileAdd {
                add_name: f(add_name)?,
                add_inode: f(add_inode)?,
                contents: if let Some(c) = contents {
                    Some(f(c)?)
                } else {
                    None
                },

Replacement in "libpijul/src/change.rs" at line 1163 [3.831311]
B:BD[3.865627] → [9.2046:2071]
```
            Hunk::Edit {
```
[3.865627]
[9.2071]
```
            BaseHunk::Edit {
```
Replacement in "libpijul/src/change.rs" at line 1167 [3.831311]
B:BD[9.2144] → [9.2144:2174]
∅:D[9.2174] → [6.122190:122238]
∅:D[5.8063] → [6.122190:122238]
B:BD[3.865688] → [6.122190:122238]
```
            } => Hunk::Edit {
                change: change.globalize(txn)?,
```
[9.2144]
[3.865735]
```
            } => BaseHunk::Edit {
                change: f(change)?,
```
Replacement in "libpijul/src/change.rs" at line 1172 [3.831311]
B:BD[3.865773] → [5.8064:8096]
```
            Hunk::Replacement {
```
[3.865773]
[3.865807]
```
            BaseHunk::Replacement {
```

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

∅:D[9.2228] → [5.8097:8134]

B:BD[3.865883] → [5.8097:8134]

∅:D[5.8134] → [6.122239:122345]

B:BD[3.865922] → [6.122239:122345]

            } => Hunk::Replacement {
                change: change.globalize(txn)?,
                replacement: replacement.globalize(txn)?,

[9.2228]

[3.866026]

            } => BaseHunk::Replacement {
                change: f(change)?,
                replacement: f(replacement)?,

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

B:BD[3.866064] → [5.8135:8220]

∅:D[5.8220] → [6.122346:122394]

B:BD[3.866153] → [6.122346:122394]

            Hunk::SolveOrderConflict { change, local } => Hunk::SolveOrderConflict {
                change: change.globalize(txn)?,

[3.866064]

[3.866200]

            BaseHunk::SolveOrderConflict { change, local } => BaseHunk::SolveOrderConflict {
                change: f(change)?,

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

B:BD[3.866238] → [5.8221:8310]

∅:D[5.8310] → [6.122395:122443]

B:BD[3.866331] → [6.122395:122443]

            Hunk::UnsolveOrderConflict { change, local } => Hunk::UnsolveOrderConflict {
                change: change.globalize(txn)?,

[3.866238]

[3.866378]

            BaseHunk::UnsolveOrderConflict { change, local } => BaseHunk::UnsolveOrderConflict {
                change: f(change)?,

Replacement in "libpijul/src/change.rs" at line 1191 [3.831311]
B:BD[3.866416] → [9.2256:2293]
```
            Hunk::ResurrectZombies {
```
[3.866416]
[9.2293]
```
            BaseHunk::ResurrectZombies {
```

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

B:BD[9.2366] → [9.2366:2408]

∅:D[9.2408] → [6.122444:122492]

∅:D[5.8392] → [6.122444:122492]

B:BD[3.866501] → [6.122444:122492]

            } => Hunk::ResurrectZombies {
                change: change.globalize(txn)?,

[9.2366]

[3.866548]

            } => BaseHunk::ResurrectZombies {
                change: f(change)?,

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

[6.122504]

[3.866596]

    }
}
impl<Local> Hunk<Option<ChangeId>, Local> {
    pub fn globalize<T: GraphTxnT>(
        self,
        txn: &T,
    ) -> Result<Hunk<Option<Hash>, Local>, T::GraphError> {
        self.atom_map(|x| x.globalize(txn))

Insertion in "libpijul/src/change/text_changes.rs" at line 719 [10.37976]
[10.61420]
[10.61420]
```
                        byte: None,
```
Insertion in "libpijul/src/change/text_changes.rs" at line 739 [10.37976]
[10.62075]
[10.62075]
```
                        byte: None,
```
Insertion in "libpijul/src/change/text_changes.rs" at line 864 [10.37976]
[10.66364]
[10.66364]
```
                            byte: None,
```
Insertion in "libpijul/src/change/text_changes.rs" at line 875 [10.37976]
[10.66801]
[10.66801]
```
                            byte: None,
```
Insertion in "libpijul/src/change/text_changes.rs" at line 893 [10.37976]
[10.67507]
[10.67507]
```
                        byte: None,
```

Slightly more generic libpijul::change::Hunk

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in "libpijul/src/change/text_changes.rs" at line 719 [10.37976]

Insertion in "libpijul/src/change/text_changes.rs" at line 739 [10.37976]

Insertion in "libpijul/src/change/text_changes.rs" at line 864 [10.37976]

Insertion in "libpijul/src/change/text_changes.rs" at line 875 [10.37976]

Insertion in "libpijul/src/change/text_changes.rs" at line 893 [10.37976]