ilyagr/pijul - Change MDY344ZZLCKXHA7VGJJYLNPCLHPI3I3LFODUYBPBH32SQ3SOOFIAC

Options to use Patience diff instead of Myers

Created by pmeunier on February 27, 2023

MDY344ZZLCKXHA7VGJJYLNPCLHPI3I3LFODUYBPBH32SQ3SOOFIAC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/commands/record.rs at line 56 [4.101759]

[3.477]

[4.102757]

    /// Use Patience diff instead of the default Myers diff
    #[clap(long = "patience")]
    pub patience: bool,

Replacement in pijul/src/commands/record.rs at line 324 [4.101759]

∅:D[5.13989] → [6.1269:1329]

B:BD[6.1269] → [6.1269:1329]

                            libpijul::Algorithm::default(),

[5.13989]

[7.44]

                            if self.patience {
                                libpijul::Algorithm::Patience
                            } else {
                                libpijul::Algorithm::default()
                            },

Replacement in pijul/src/commands/record.rs at line 342 [4.101759]

∅:D[5.14195] → [6.1642:1694]

B:BD[6.1642] → [6.1642:1694]

                    libpijul::Algorithm::default(),

[5.14195]

[7.80]

                    if self.patience {
                        libpijul::Algorithm::Patience
                    } else {
                        libpijul::Algorithm::default()
                    },

Insertion in pijul/src/commands/record.rs at line 360 [4.101759]

[5.14343]

                    if self.patience {
                        libpijul::Algorithm::Patience
                    } else {
                        libpijul::Algorithm::default()
                    },

Insertion in pijul/src/commands/diff.rs at line 35 [4.173551]

[4.174036]

    /// Use Patience diff instead of the default Myers diff
    #[clap(long = "patience")]
    pub patience: bool,

Replacement in pijul/src/commands/diff.rs at line 72 [4.173551]

∅:D[5.20138] → [4.174545:174593]

B:BD[4.174545] → [4.174545:174593]

                libpijul::Algorithm::default(),

[5.20138]

[2.0]

                if self.patience {
                    libpijul::Algorithm::Patience
                } else {
                    libpijul::Algorithm::default()
                },

Insertion in pijul/src/commands/diff.rs at line 89 [4.173551]

[5.20279]

                if self.patience {
                    libpijul::Algorithm::Patience
                } else {
                    libpijul::Algorithm::default()
                },

Insertion in libpijul/src/working_copy/filesystem.rs at line 164 [4.208900]
[8.757]
[5.27781]
```
        algo: crate::Algorithm,
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 180 [4.208900]
[5.28002]
[5.28002]
```
                algo,
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 194 [4.208900]
[9.679]
[9.679]
```
                algo,
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 318 [4.208900]
[8.858]
[5.28306]
```
        algorithm: crate::Algorithm,
```
Replacement in libpijul/src/working_copy/filesystem.rs at line 344 [4.208900]
B:BD[10.560] → [10.560:601]
```
            crate::Algorithm::default(),
```
[10.560]
[7.147]
```
            algorithm,
```
Replacement in libpijul/src/diff/mod.rs at line 20 [4.793247]
B:BD[4.793459] → [11.226:255]
```
#[derive(Hash, Clone, Copy)]
```
[4.793459]
[4.793495]
```
#[derive(Clone, Copy)]
```

Insertion in libpijul/src/diff/mod.rs at line 32 [4.793247]

[11.459]

    }
}
impl<'a> std::hash::Hash for Line<'a> {
    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
        self.l.hash(state);

Replacement in libpijul/Cargo.toml at line 114 [4.1020742]
B:BD[4.1023274] → [4.1023274:1023288]
```
diffs = "0.4"
```
[4.1023256]
[4.1023305]
```
diffs = "0.5"
```

Options to use Patience diff instead of Myers

Dependencies

In channels

Change contents

Insertion in pijul/src/commands/record.rs at line 56 [4.101759]

Replacement in pijul/src/commands/record.rs at line 324 [4.101759]

Replacement in pijul/src/commands/record.rs at line 342 [4.101759]

Insertion in pijul/src/commands/record.rs at line 360 [4.101759]

Insertion in pijul/src/commands/diff.rs at line 35 [4.173551]

Replacement in pijul/src/commands/diff.rs at line 72 [4.173551]

Insertion in pijul/src/commands/diff.rs at line 89 [4.173551]

Insertion in libpijul/src/working_copy/filesystem.rs at line 164 [4.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 180 [4.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 194 [4.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 318 [4.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 344 [4.208900]

Replacement in libpijul/src/diff/mod.rs at line 20 [4.793247]

Insertion in libpijul/src/diff/mod.rs at line 32 [4.793247]

Replacement in libpijul/Cargo.toml at line 114 [4.1020742]