irevoire/pijul - Change Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC

merge with changes from sanakirja v1.1.2

Created by rohan on February 26, 2021

Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in "libpijul/src/working_copy/mod.rs" at line 1 [8.198172]
∅:∅[6.15] → [7.0:33]
B:B[8.198228] → [7.0:33]
BD:B[8.198228] → [7.0:33]
```
use chardetng::EncodingDetector;
```
Resurrecting zombie bytes in "libpijul/src/working_copy/mod.rs" at line 2 [8.198172]
∅:∅[6.66] → [7.63:64]
B:B[7.63] → [7.63:64]
BD:B[7.63] → [7.63:64]
Resurrecting zombie bytes in "libpijul/src/working_copy/mod.rs" at line 3 [8.198172]
B:B[7.64] → [9.0:63]
BD:B[7.64] → [9.0:63]
```
use crate::{pristine::InodeMetadata, text_encoding::Encoding};
```
File un-deletion: text.rs, text.rs, text.rs
BFD:BF[8.248792] → [10.0:9]
BFD:BF[8.248792] → [6.2008:2017]
BF:BF[10.9] → [10.10:10]
BF:BF[6.2017] → [10.10:10]
BF:BF[10.9] → [10.10:10]
BF:BF[6.2017] → [10.10:10]
BF:BF[5.375] → [10.10:10]
BF:BF[8.248792] → [5.366:375]
Deletion in libpijul/src/tests/text.rs at line 2 [10.10]
B:BD[10.25] → [10.25:47]
```
use crate::change::*;
```

Replacement in libpijul/src/tests/text.rs at line 21 [10.10]

B:BD[10.669] → [10.669:751]

    let (h, change) = record_all(&mut repo, &store, &mut txn, &mut channel, "")?;

[10.669]

[10.751]

    let (h, change) = record_all_change(&mut repo, &store, &mut txn, &mut channel, "")?;

Replacement in libpijul/src/tests/text.rs at line 77 [10.10]

B:BD[10.2456] → [10.2456:2540]

    let (h1, change1) = record_all(&mut repo, &store, &mut txn, &mut channel, "")?;

[10.2456]

[10.2540]

    let (h1, change1) = record_all_change(&mut repo, &store, &mut txn, &mut channel, "")?;

Deletion in libpijul/src/tests/text.rs at line 105 [10.10]

B:BD[10.3149] → [10.3149:4356]


fn record_all<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(
    repo: &mut R,
    store: &P,
    txn: &mut T,
    channel: &mut ChannelRef<T>,
    prefix: &str,
) -> Result<(Hash, Change), anyhow::Error>
where
    R::Error: Send + Sync + 'static,
{
    let mut state = Builder::new();
    state.record(txn, Algorithm::default(), channel, repo, store, prefix)?;
    let rec = state.finish();
    let changes = rec
        .actions
        .into_iter()
        .map(|rec| rec.globalize(txn))
        .collect();
    let change0 = crate::change::Change::make_change(
        txn,
        &channel,
        changes,
        rec.contents,
        crate::change::ChangeHeader {
            message: "test".to_string(),
            authors: vec![],
            description: None,
            // Beware of changing the following line: two changes
            // doing the same thing will be equal. Sometimes we don't
            // want that, as in tests::unrecord::unrecord_double.
            timestamp: chrono::Utc::now(),
        },
        Vec::new(),
    );
    let hash = store.save_change(&change0)?;
    apply::apply_local_change(txn, channel, &change0, hash, &rec.updatables)?;
    Ok((hash, change0))
}

Insertion in libpijul/src/tests/mod.rs at line 1 [8.289338]
[8.289338]
[8.289394]
```
use crate::change::{Local, LocalChange};
```
Solving an order conflict in libpijul/src/tests/mod.rs at line 20 [8.289338]
[11.14]
[10.4357]

Replacement in libpijul/src/tests/mod.rs at line 23 [8.289338]

B:BD[8.289730] → [12.1788:1847]

fn record_all<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(

[8.289730]

[8.289795]

fn record_all_change<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(

Replacement in libpijul/src/tests/mod.rs at line 29 [8.289338]
B:BD[8.289896] → [13.1628:1661]
```
) -> Result<Hash, anyhow::Error>
```
[8.289896]
[13.1661]
```
) -> Result<(Hash, LocalChange<Local>), anyhow::Error>
```

Insertion in libpijul/src/tests/mod.rs at line 79 [8.289338]

[4.25832]

[8.291146]

    Ok((hash, change0))
}
fn record_all<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(
    repo: &mut R,
    store: &P,
    txn: &mut T,
    channel: &mut ChannelRef<T>,
    prefix: &str,
) -> Result<Hash, anyhow::Error>
where
    R::Error: Send + Sync + 'static,
{
    let Ok((hash, _)) = record_all_change(repo, store, txn, channel, prefix);

Deletion in libpijul/src/record.rs at line 2 [8.488880]
B:BD[8.488937] → [14.571:613]
BD:BD[8.488937] → [14.571:613]
B:BD[14.677] → [14.677:678]
BD:BD[14.677] → [14.677:678]
```
use std::collections::{HashMap, HashSet};
```
Insertion in libpijul/src/record.rs at line 11 [8.488880]
[8.489199]
[15.11033]
```
use std::collections::{HashMap, HashSet};
```
Resurrecting zombie bytes in "libpijul/src/record.rs" at line 273 [8.488880]
B:B[8.496480] → [4.49402:49474]
BD:B[8.496480] → [4.49402:49474]
BD:B[8.496480] → [4.49402:49474]
```
            let start = ChangePosition(self.rec.contents.len().into());
```

Insertion in libpijul/src/record.rs at line 273 [8.488880]

[8.496437]

[4.49402]

        let (contents, encoding) = if meta.is_file() {
            let encoding = working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 276 [8.488880]

B:B[8.496630] → [4.49475:49643]

BD:B[8.496630] → [4.49475:49643]

            let end = ChangePosition(self.rec.contents.len().into());
            self.rec.largest_file = self.rec.largest_file.max(end.0.as_u64() - start.0.as_u64());

Insertion in libpijul/src/record.rs at line 276 [8.488880]
[4.49474]
[4.49475]
```
            self.rec.has_binary_files |= encoding.is_none();
```
Deletion in libpijul/src/record.rs at line 279 [8.488880]
B:BD[8.496823] → [4.49644:49750]
BD:BD[8.496823] → [4.49644:49750]
BD:BD[8.496823] → [4.49644:49750]
```
                let s = start.0.into();
                let e = end.0.as_usize().min(s + CHECK_UTF8 + 4);
```
Resurrecting zombie bytes in "libpijul/src/record.rs" at line 280 [8.488880]
B:B[8.497247] → [16.0:29]
BD:B[8.497247] → [16.0:29]
```
            if end > start {
```
Deletion in libpijul/src/record.rs at line 281 [8.488880]
B:BD[8.497606] → [17.6231:6275]
BD:BD[8.497606] → [17.6231:6275]
```
                    flag: EdgeFlags::BLOCK,
```

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 281 [8.488880]

B:B[8.497313] → [6.2232:2575]

BD:B[8.497313] → [6.2232:2575]

                (
                    Some(Atom::NewVertex(NewVertex {
                        up_context: vec![Position {
                            change: None,
                            pos: inode_pos,
                        }],
                        down_context: vec![],
                        start,
                        end,

Replacement in libpijul/src/record.rs at line 290 [8.488880]

B:BD[6.2575] → [6.2575:2625]

BD:BD[6.2575] → [6.2575:2625]

                        flag: EdgeFlags::empty(),

[6.2575]

[6.2625]

                        flag: EdgeFlags::BLOCK,

Deletion in libpijul/src/record.rs at line 1142 [8.488880]
B:BD[8.496437] → [6.2018:2073]
BD:BD[8.496437] → [6.2018:2073]
B:BD[8.496780] → [6.2170:2231]
BD:BD[8.496780] → [6.2170:2231]
B:BD[8.496552] → [6.2074:2169]
BD:BD[8.496552] → [6.2074:2169]
```
        let (contents, encoding) = if meta.is_file() {
            self.rec.has_binary_files |= encoding.is_none();
            let encoding = working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;
```
File un-deletion: mod.rs, mod.rs, mod.rs
BFD:BF[8.768883] → [6.2937:2945]
BFD:BF[8.768883] → [8.793238:793246]
BF:BF[6.2945] → [8.793247:793247]
BF:BF[8.793246] → [8.793247:793247]
BF:BF[8.793246] → [8.793247:793247]
BF:BF[5.384] → [8.793247:793247]
BF:BF[8.768883] → [5.376:384]
BF:BF[6.2945] → [8.793247:793247]
Deletion in libpijul/src/diff/mod.rs at line 64 [8.793247]
B:BD[18.5921] → [19.6675:6760]
BD:BD[18.5921] → [19.6675:6760]
```
            self.diff_binary(changes, txn, txn.graph(channel), path, inode, a, &b)?;
```

Resurrecting zombie bytes in "libpijul/src/diff/mod.rs" at line 64 [8.793247]

B:B[8.794648] → [10.4948:5212]

BD:B[8.794648] → [10.4948:5212]

        let mime_a = tree_magic_mini::from_u8(&d.contents_a);
        let mime_b = tree_magic_mini::from_u8(&b);
        debug!("mimes = {:?}, {:?}", mime_a, mime_b);
        if (!mime_a.starts_with("text/") || !mime_b.starts_with("text/")) && d.contents_a != b {

Insertion in libpijul/src/diff/mod.rs at line 64 [8.793247]
[8.794648]
[10.4948]
```
        // TODO pass through the encodings and use that to decide
```

Insertion in libpijul/src/diff/mod.rs at line 69 [8.793247]

[10.5212]

[18.5994]

            self.diff_binary(changes, txn, txn.graph(channel), path, inode, a, &b)?;

Insertion in libpijul/src/change.rs at line 1118 [8.831311]
[8.865376]
[3.7972]
```
                encoding,
```
Deletion in libpijul/src/change.rs at line 1120 [8.831311]
B:BD[8.865376] → [6.3085:3111]
BD:BD[8.865376] → [6.3085:3111]
```
                encoding,
```

Replacement in libpijul/src/change/text_changes.rs at line 434 [15.37976]

∅:D[4.140860] → [21.2882:2930]

B:BD[15.53215] → [21.2882:2930]

B:BD[15.53215] → [5.385:448]

BD:BD[15.53215] → [5.385:448]

                    print_contents(w, "+", c)?;
                    print_contents(&mut w, "+", c, encoding)?;

[4.140860]

[15.53268]

                    print_contents(w, "+", c, encoding)?;

Deletion in libpijul/src/change/text_changes.rs at line 1226 [15.37976]
B:BD[15.84951] → [21.3870:3912]
BD:BD[15.84951] → [21.3870:3912]
BD:BD[15.84951] → [21.3870:3912]
```
            w.write_change_line(pref, a)?
```
Replacement in libpijul/src/change/text_changes.rs at line 1228 [15.37976]
B:BD[15.85037] → [21.3913:3962]
BD:BD[15.85037] → [21.3913:3962]
∅:D[5.591] → [10.5804:5848]
∅:D[14.1861] → [10.5804:5848]
B:BD[10.5804] → [10.5804:5848]
```
            w.write_change_line(pref, contents)?
            writeln!(w, "{} {}", pref, a)?;
```
[5.591]
[15.85088]
```
            w.write_change_line(pref, a)?
```
Resurrecting zombie bytes in "libpijul/src/change/text_changes.rs" at line 1244 [15.37976]
B:B[15.85462] → [4.143164:143228]
BD:B[15.85462] → [4.143164:143228]
```
            let c = &change_contents[n.start.us()..n.end.us()];
```
Resurrecting zombie bytes in "libpijul/src/change/text_changes.rs" at line 1245 [15.37976]
B:B[15.85538] → [5.592:639]
BD:B[15.85538] → [5.592:639]
```
            print_contents(w, "+", c, &None)?;
```
Resurrecting zombie bytes in "libpijul/Cargo.toml" at line 116 [8.1020742]
B:B[8.1023338] → [10.5871:5941]
BD:B[8.1023338] → [10.5871:5941]
```
tree_magic_mini = "1.0.0"
chardetng = "0.1.10"
encoding_rs = "0.8.26"
```
Solving an order conflict in Cargo.lock at line 986 [8.1030385]
[23.3328]
[10.6687]

Deletion in Cargo.lock at line 1183 [8.1030385]

∅:D[24.961] → [25.2863:3071]

B:BD[25.2863] → [25.2863:3071]

B:BD[25.3071] → [22.1451:1462]

]
[[package]]
name = "ntapi"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
dependencies = [
 "winapi",

Resurrecting zombie bytes in "Cargo.lock" at line 1183 [8.1030385]

B:B[8.1060297] → [10.6740:6992]

BD:B[8.1060297] → [10.6740:6992]

]
[[package]]
name = "nom"
version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
dependencies = [
 "lexical-core",
 "memchr",
 "version_check",

Insertion in Cargo.lock at line 1194 [8.1030385]

[10.6992]

[8.1060297]

]
[[package]]
name = "ntapi"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
dependencies = [
 "winapi",

merge with changes from sanakirja v1.1.2

Dependencies

In channels

Change contents

Resurrecting zombie bytes in "libpijul/src/working_copy/mod.rs" at line 1 [8.198172]

Resurrecting zombie bytes in "libpijul/src/working_copy/mod.rs" at line 2 [8.198172]

Resurrecting zombie bytes in "libpijul/src/working_copy/mod.rs" at line 3 [8.198172]

File un-deletion: text.rs, text.rs, text.rs

Deletion in libpijul/src/tests/text.rs at line 2 [10.10]

Replacement in libpijul/src/tests/text.rs at line 21 [10.10]

Replacement in libpijul/src/tests/text.rs at line 77 [10.10]

Deletion in libpijul/src/tests/text.rs at line 105 [10.10]

Insertion in libpijul/src/tests/mod.rs at line 1 [8.289338]

Solving an order conflict in libpijul/src/tests/mod.rs at line 20 [8.289338]

Replacement in libpijul/src/tests/mod.rs at line 23 [8.289338]

Replacement in libpijul/src/tests/mod.rs at line 29 [8.289338]

Insertion in libpijul/src/tests/mod.rs at line 79 [8.289338]

Deletion in libpijul/src/record.rs at line 2 [8.488880]

Insertion in libpijul/src/record.rs at line 11 [8.488880]

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 273 [8.488880]

Insertion in libpijul/src/record.rs at line 273 [8.488880]

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 276 [8.488880]

Insertion in libpijul/src/record.rs at line 276 [8.488880]

Deletion in libpijul/src/record.rs at line 279 [8.488880]

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 280 [8.488880]

Deletion in libpijul/src/record.rs at line 281 [8.488880]

Resurrecting zombie bytes in "libpijul/src/record.rs" at line 281 [8.488880]

Replacement in libpijul/src/record.rs at line 290 [8.488880]

Deletion in libpijul/src/record.rs at line 1142 [8.488880]

File un-deletion: mod.rs, mod.rs, mod.rs

Deletion in libpijul/src/diff/mod.rs at line 64 [8.793247]

Resurrecting zombie bytes in "libpijul/src/diff/mod.rs" at line 64 [8.793247]

Insertion in libpijul/src/diff/mod.rs at line 64 [8.793247]

Insertion in libpijul/src/diff/mod.rs at line 69 [8.793247]

Insertion in libpijul/src/change.rs at line 1118 [8.831311]

Deletion in libpijul/src/change.rs at line 1120 [8.831311]

Replacement in libpijul/src/change/text_changes.rs at line 434 [15.37976]

Deletion in libpijul/src/change/text_changes.rs at line 1226 [15.37976]

Replacement in libpijul/src/change/text_changes.rs at line 1228 [15.37976]

Resurrecting zombie bytes in "libpijul/src/change/text_changes.rs" at line 1244 [15.37976]

Resurrecting zombie bytes in "libpijul/src/change/text_changes.rs" at line 1245 [15.37976]

Resurrecting zombie bytes in "libpijul/Cargo.toml" at line 116 [8.1020742]

Solving an order conflict in Cargo.lock at line 986 [8.1030385]

Deletion in Cargo.lock at line 1183 [8.1030385]

Resurrecting zombie bytes in "Cargo.lock" at line 1183 [8.1030385]

Insertion in Cargo.lock at line 1194 [8.1030385]