hardy7cc/pijul - Change TV7KEL6ZRISTBK6AKHFXMJI5D5W5SEOK6MOIZSVVX64Q5YUH3EVAC

Make `Choice` fields `pijul_config::Config` non-optional

Removes the need for redundant unwrapping logic on the command side, as any Choice with no specified value will automatically be assigned Choice::Auto.

Created by finchie on July 29, 2025

TV7KEL6ZRISTBK6AKHFXMJI5D5W5SEOK6MOIZSVVX64Q5YUH3EVAC

Dependencies

In channels

main

Change contents

Replacement in pijul-config/src/lib.rs at line 63 [12.89866]

B:BD[5.41] → [7.78:128]

∅:D[5.41] → [3.252:315]

∅:D[7.128] → [3.252:315]

B:BD[2.67] → [3.252:315]

    pub reset_overwrites_changes: Option<Choice>,
    pub colors: Option<Choice>,
    pub pager: Option<Choice>,

[5.41]

[9.5432]

    pub reset_overwrites_changes: Choice,
    pub colors: Choice,
    pub pager: Choice,

Replacement in pijul-config/src/lib.rs at line 188 [12.89866]
B:BD[9.7951] → [9.7951:8011]
∅:D[9.8011] → [4.2398:2399]
B:BD[4.2398] → [4.2398:2399]
B:BD[4.2399] → [9.8012:8041]
```
        let color_choice = self.colors.unwrap_or_default();
        match color_choice {
```
[9.7951]
[9.8041]
```
        match self.colors {
```
Insertion in pijul-config/src/defaults.toml at line 2 [11.1903]
[11.1935]
[11.1935]
```
reset_overwrites_changes = "auto"
colors = "auto"
pager = "auto"
```

Replacement in pijul/src/commands/reset.rs at line 36 [12.97650]

B:BD[10.10181] → [10.10181:10262]

∅:D[10.10262] → [8.69:220]

B:BD[7.353] → [8.69:220]

        let overwrite_changes = match config.reset_overwrites_changes.as_ref() {
            Some(pijul_config::Choice::Never) => false,
            Some(pijul_config::Choice::Auto) | Some(pijul_config::Choice::Always) | _ => true,

[10.10181]

[7.507]

        let overwrite_changes = match config.reset_overwrites_changes {
            pijul_config::Choice::Never => false,
            pijul_config::Choice::Auto | pijul_config::Choice::Always => true,

Replacement in pijul/src/commands/mod.rs at line 142 [12.133619]

B:BD[10.13028] → [10.13028:13090]

    if let Some(pijul_config::Choice::Never) = config.pager {

[10.13028]

[6.546]

    if let pijul_config::Choice::Never = config.pager {

Replacement in pijul/src/commands/diff.rs at line 349 [12.173551]

B:BD[10.15060] → [10.15060:15198]

        Some(pijul_config::Choice::Always) => colors = true,
        Some(pijul_config::Choice::Never) => colors = false,
        _ => {}

[10.15060]

[10.15198]

        pijul_config::Choice::Auto => (),
        pijul_config::Choice::Always => colors = true,
        pijul_config::Choice::Never => colors = false,

Replacement in pijul/src/commands/diff.rs at line 354 [12.173551]

B:BD[10.15229] → [10.15229:15290]

        Some(pijul_config::Choice::Never) => colors = false,

[10.15229]

[10.15290]

        pijul_config::Choice::Never => colors = false,