laumann/pijul - Change 3SJ3DJNFDA665FS5RLD3HA5S2RKMB5GTA56MBF77YSOPCOHTFMYAC

Adding a --force option to `pijul add`, to include otherwise ignored files

Created by pmeunier on January 2, 2022

3SJ3DJNFDA665FS5RLD3HA5S2RKMB5GTA56MBF77YSOPCOHTFMYAC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/commands/record.rs at line 341 [5.101759]
[5.107478]
[6.583]
```
                false,
```
Insertion in pijul/src/commands/git.rs at line 746 [5.137210]
[3.269]
[3.269]
```
            false,
```
Insertion in pijul/src/commands/git.rs at line 768 [5.137210]
[3.977]
[3.977]
```
            false,
```
Insertion in pijul/src/commands/file_operations.rs at line 148 [5.169058]
[7.243]
[7.243]
```
                    self.force,
```
Insertion in pijul/src/commands/diff.rs at line 87 [5.173551]
[5.175012]
[8.321]
```
                false,
```

Replacement in pijul/src/commands/diff.rs at line 360 [5.173551]

B:BD[9.2456] → [9.2456:2532]

        .iterate_prefix_rec(repo_path.clone(), repo_path.clone(), threads)?

[9.2456]

[9.2532]

        .iterate_prefix_rec(repo_path.clone(), repo_path.clone(), false, threads)?

Insertion in libpijul/src/working_copy/filesystem.rs at line 13 [5.208900]
[10.1016]
[11.807]
```
/// Returns whether `path` is a child of `root_` (or `root_` itself).
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 169 [5.208900]
[5.210434]
[8.374]
```
        force: bool,
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 184 [5.208900]
[8.585]
[8.585]
```
                force,
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 197 [5.208900]
[8.810]
[8.810]
```
                force,
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 210 [5.208900]
[12.1825]
[8.851]
```
        force: bool,
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 215 [5.208900]

B:BD[9.3672] → [9.3672:3758]

        for p in self.iterate_prefix_rec(repo_path.clone(), full.clone(), threads)? {

[9.3672]

[9.3758]

        for p in self.iterate_prefix_rec(repo_path.clone(), full.clone(), force, threads)? {

Insertion in libpijul/src/working_copy/filesystem.rs at line 236 [5.208900]
[9.4277]
[9.4277]
```
        force: bool,
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 245 [5.208900]

B:BD[12.1901] → [13.119:268]

B:BD[13.268] → [9.4347:4451]

        if !filter_ignore(
            &repo_path.as_canonical_path(),
            &full.as_canonical_path(),
            meta.is_dir(),
        ) {
            return Ok(Untracked {
                join: None,
                receiver,
            });

[12.1901]

[14.175]

        debug!("force = {:?}", force);
        if !force {
            if !filter_ignore(
                &repo_path.as_canonical_path(),
                &full.as_canonical_path(),
                meta.is_dir(),
            ) {
                return Ok(Untracked {
                    join: None,
                    receiver,
                });
            }

Replacement in libpijul/src/working_copy/filesystem.rs at line 261 [5.208900]

B:BD[14.273] → [14.273:345]

                walk.ignore(true)
                    .git_ignore(true)

[14.273]

[2.0]

                walk.ignore(!force)
                    .git_ignore(!force)

Insertion in libpijul/src/working_copy/filesystem.rs at line 322 [5.208900]
[5.211282]
[8.3106]
```
        force: bool,
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 335 [5.208900]

∅:D[4.8813] → [15.1294:1374]

B:BD[15.1294] → [15.1294:1374]

                    self.add_prefix_rec(&txn, repo_path, full, threads, salt)?;

[4.8813]

[15.1374]

                    self.add_prefix_rec(&txn, repo_path, full, force, threads, salt)?;

Adding a --force option to `pijul add`, to include otherwise ignored files

Dependencies

In channels

Change contents

Insertion in pijul/src/commands/record.rs at line 341 [5.101759]

Insertion in pijul/src/commands/git.rs at line 746 [5.137210]

Insertion in pijul/src/commands/git.rs at line 768 [5.137210]

Insertion in pijul/src/commands/file_operations.rs at line 148 [5.169058]

Insertion in pijul/src/commands/diff.rs at line 87 [5.173551]

Replacement in pijul/src/commands/diff.rs at line 360 [5.173551]

Insertion in libpijul/src/working_copy/filesystem.rs at line 13 [5.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 169 [5.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 184 [5.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 197 [5.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 210 [5.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 215 [5.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 236 [5.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 245 [5.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 261 [5.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 322 [5.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 335 [5.208900]