dblsaiko/pijul - Change WTPFQPO5C3OWNOEIZQSIMAR7O6URYJJNUJSWDZUTWFDDAMNFMTLQC

Add global `no_prompt` flag

This removes a hack that hard-coded pijul_interaction to always be in a terminal context, and should now properly support the --no-prompt flag anywhere in the codebase. There might be some bugs in code paths where --no-prompt is active, the best way to address those is a proper re-write of the test suite.

Created by finchie on August 17, 2023

WTPFQPO5C3OWNOEIZQSIMAR7O6URYJJNUJSWDZUTWFDDAMNFMTLQC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/main.rs at line 11 [5.83981]
[4.694]
[4.716]
```
use pijul_interaction::InteractiveContext;
```

Insertion in pijul/src/main.rs at line 22 [5.83981]

[5.84538]

    /// Abort rather than prompt for input
    #[clap(long, global = true)]
    pub no_prompt: bool,

Deletion in pijul/src/main.rs at line 155 [5.83981]

B:BD[6.20] → [7.672:757]

    pijul_interaction::set_context(pijul_interaction::InteractiveContext::Terminal);

Insertion in pijul/src/main.rs at line 160 [5.83981]
[8.106]
[9.100]

Insertion in pijul/src/main.rs at line 162 [5.83981]

[9.130]

[10.422]

    if opts.no_prompt {
        pijul_interaction::set_context(InteractiveContext::NotInteractive);
    } else {
        pijul_interaction::set_context(InteractiveContext::Terminal);
    }

Replacement in pijul/src/identity/repair.rs at line 42 [11.56]

B:BD[11.3347] → [11.3347:3509]

///
/// # Arguments
/// * `no_prompt` - If the user should not be prompted for input.
pub async fn fix_identities(no_prompt: bool) -> Result<(), anyhow::Error> {

[11.3347]

[11.3509]

pub async fn fix_identities() -> Result<(), anyhow::Error> {

Replacement in pijul/src/identity/repair.rs at line 63 [11.56]

B:BD[11.4220] → [12.0:69]

                old_identity.clone().create(no_prompt, true).await?;

[11.4220]

[11.4888]

                old_identity.clone().create(true).await?;

Deletion in pijul/src/identity/repair.rs at line 88 [11.56]

B:BD[11.6056] → [11.6056:6185]

                        if no_prompt {
                            bail!("No identities configured");
                        }

Replacement in pijul/src/identity/repair.rs at line 89 [11.56]

B:BD[11.6256] → [11.6256:6333]

                        Complete::default()?.create(no_prompt, true).await?;

[11.6256]

[11.6333]

                        Complete::default()?.create(true).await?;

Deletion in pijul/src/identity/load.rs at line 66 [11.22387]
B:BD[11.24405] → [11.24405:24491]
```
/// # Arguments
/// * `no_prompt` - If the user should not be prompted for input.
///
```

Replacement in pijul/src/identity/load.rs at line 68 [11.22387]

B:BD[11.24577] → [11.24577:24663]

pub async fn choose_identity_name(no_prompt: bool) -> Result<String, anyhow::Error> {

[11.24577]

[11.24663]

pub async fn choose_identity_name() -> Result<String, anyhow::Error> {

Replacement in pijul/src/identity/load.rs at line 75 [11.22387]
B:BD[11.24848] → [11.24848:24890]
```
        fix_identities(no_prompt).await?;
```
[11.24848]
[11.24890]
```
        fix_identities().await?;
```

Deletion in pijul/src/identity/load.rs at line 81 [11.22387]

B:BD[11.25052] → [11.25052:25155]

    } else if no_prompt {
        bail!("Cannot prompt user to choose identity (--no-prompt is set)");

Deletion in pijul/src/identity/create.rs at line 268 [11.28175]
B:BD[11.38371] → [11.38371:38441]
```
    /// * `no_prompt` - If the user should not be prompted for input.
```

Replacement in pijul/src/identity/create.rs at line 269 [11.28175]

B:BD[11.38529] → [12.1720:1818]

    pub async fn create(&self, no_prompt: bool, link_remote: bool) -> Result<(), anyhow::Error> {

[11.38529]

[13.14019]

    pub async fn create(&self, link_remote: bool) -> Result<(), anyhow::Error> {

Replacement in pijul/src/identity/create.rs at line 271 [11.28175]
∅:D[13.14076] → [11.38665:38713]
B:BD[11.38665] → [11.38665:38713]
B:BD[11.38713] → [13.14077:14102]
∅:D[13.14102] → [11.38730:38747]
B:BD[11.38730] → [11.38730:38747]
B:BD[11.38747] → [14.966:1024]
∅:D[14.1024] → [11.38787:38799]
∅:D[13.14162] → [11.38787:38799]
B:BD[11.38787] → [11.38787:38799]
```
        let confirmed_identity = if no_prompt {
            self.clone()
        } else {
            self.prompt_changes(None, link_remote).await?
        };
```
[13.14076]
[15.1007]
```
        let confirmed_identity = self.prompt_changes(None, link_remote).await?;
```

Replacement in pijul/src/commands/tag.rs at line 281 [18.74]

∅:D[16.788] → [17.229:329]

B:BD[17.229] → [17.229:329]

        let k = crate::identity::public_key(&crate::identity::choose_identity_name(false).await?)?;

[16.788]

[17.329]

        let k = crate::identity::public_key(&crate::identity::choose_identity_name().await?)?;

Replacement in pijul/src/commands/record.rs at line 153 [5.101759]

B:BD[13.15216] → [13.15216:15315]

            crate::identity::Complete::load(&crate::identity::choose_identity_name(false).await?)?

[13.15216]

[13.15315]

            crate::identity::Complete::load(&crate::identity::choose_identity_name().await?)?

Replacement in pijul/src/commands/record.rs at line 227 [5.101759]

B:BD[17.953] → [17.953:1038]

                    .unwrap_or(crate::identity::choose_identity_name(false).await?),

[17.953]

[17.1038]

                    .unwrap_or(crate::identity::choose_identity_name().await?),

Replacement in pijul/src/commands/identity.rs at line 156 [11.40825]

B:BD[11.46167] → [11.46167:46295]

    Repair {
        /// Abort rather than prompt for input
        #[clap(long = "no-prompt")]
        no_prompt: bool,
    },

[11.46167]

[11.46295]

    Repair,

Deletion in pijul/src/commands/identity.rs at line 164 [11.40825]
∅:D[19.4441] → [11.46469:46577]
B:BD[11.46469] → [11.46469:46577]
```
        /// Abort rather than prompt for input
        #[clap(long = "no-prompt")]
        no_prompt: bool,
```

Replacement in pijul/src/commands/identity.rs at line 252 [11.40825]

B:BD[11.49307] → [11.49307:49384]

                identity.create(options.no_prompt, !options.no_link).await?;

[11.49307]

[3.1971]

                identity.create(!options.no_link).await?;

Replacement in pijul/src/commands/identity.rs at line 260 [11.40825]

B:BD[11.49398] → [11.49398:49480]

            SubCommand::Repair { no_prompt } => fix_identities(no_prompt).await?,

[11.49398]

[11.49480]

            SubCommand::Repair => fix_identities().await?,

Deletion in pijul/src/commands/identity.rs at line 264 [11.40825]
∅:D[19.4466] → [11.49543:49570]
B:BD[11.49543] → [11.49543:49570]
```
                no_prompt,
```

Replacement in pijul/src/commands/identity.rs at line 265 [11.40825]

B:BD[11.49589] → [3.2534:2656]

                let identity_name =
                    &identity_name.unwrap_or(choose_identity_name(no_prompt).await?);

[11.49589]

[3.2656]

                let identity_name = &identity_name.unwrap_or(choose_identity_name().await?);

Replacement in pijul/src/commands/identity.rs at line 376 [11.40825]

B:BD[11.54509] → [11.54509:54576]

                    choose_identity_name(options.no_prompt).await?

[11.54509]

[11.54576]

                    choose_identity_name().await?

Replacement in pijul/src/commands/identity.rs at line 430 [11.40825]

∅:D[2.176] → [11.55866:56019]

B:BD[11.55866] → [11.55866:56019]

                let identity = Complete::load(
                    &identity_name.unwrap_or(choose_identity_name(no_prompt).await?),
                )?;

[2.176]

[11.56019]

                let identity =
                    Complete::load(&identity_name.unwrap_or(choose_identity_name().await?))?;