Chasesomero/pijul - Change XK25E73FDP7K7BN636MKHFSC3NAD6F3P4NNYQNCHC7GNDE7VGPXQC

fix(no-link regression): fix attempt to change no-link that made it worse

Created by Chasesomero today at 16:38

XK25E73FDP7K7BN636MKHFSC3NAD6F3P4NNYQNCHC7GNDE7VGPXQC

Dependencies

In channels

main

Change contents

Replacement in pijul-identity/src/create.rs at line 7 [2.28175]
B:BD[2.28402] → [9.1589:1618]
```
use anyhow::{Context, bail};
```
[2.28402]
[10.292]
```
use anyhow::{Context, anyhow, bail};
```

Insertion in pijul-identity/src/create.rs at line 20 [2.28175]

[16.807]

[2.28954]

pub fn parse_expiry_date(input: &str) -> Result<Timestamp, anyhow::Error> {
    input
        .parse()
        .or_else(|_| format!("{input}T00:00:00Z").parse())
        .map_err(|_| anyhow!("Invalid date"))
}

Replacement in pijul-identity/src/create.rs at line 112 [2.28175]

B:BD[7.306] → [8.1368:1393]

B:BD[8.1393] → [13.6923:6960]

∅:D[13.6960] → [8.1424:1568]

B:BD[8.1424] → [8.1424:1568]

∅:D[8.1568] → [7.841:855]

B:BD[7.841] → [7.841:855]

B:BD[7.855] → [13.6961:7020]

∅:D[13.7020] → [8.1622:1926]

B:BD[8.1622] → [8.1622:1926]

∅:D[8.1926] → [7.1505:1519]

B:BD[7.1505] → [7.1505:1519]

        if link_remote {
            if Confirm::new(config)?
                .with_prompt("Do you want to link this identity to a remote?")
                .with_default(true)
                .interact()?
            {
                new_identity.prompt_remote(config).await?;
            } else {
                // The user wants an 'offline' identity, so make sure not to store login info
                new_identity.config.key_path = None;
                new_identity.config.author.username = String::new();
                new_identity.config.author.origin = String::new();
            }

[7.306]

[4.10782]

        if !link_remote {
            // The user wants an 'offline' identity, so make sure not to store login info
            new_identity.config.key_path = None;
            new_identity.config.author.username = String::new();
            new_identity.config.author.origin = String::new();
        } else if Confirm::new(config)?
            .with_prompt("Do you want to link this identity to a remote?")
            .with_default(true)
            .interact()?
        {
            new_identity.prompt_remote(config).await?;
        } else {
            // The user wants an 'offline' identity, so make sure not to store login info
            new_identity.config.key_path = None;
            new_identity.config.author.username = String::new();
            new_identity.config.author.origin = String::new();

Replacement in pijul-identity/src/create.rs at line 226 [2.28175]

B:BD[10.631] → [10.631:807]

                    let expiry_date: Timestamp = input
                        .parse()
                        .map_err(|error| format!("Unable to parse date: {error:#?}"))?;

[10.631]

[2.32308]

                    let expiry_date =
                        parse_expiry_date(input).map_err(|_| "Invalid date".to_string())?;

Replacement in pijul-identity/src/create.rs at line 237 [2.28175]

B:BD[2.32647] → [10.929:968]

            Some(expiry_date.parse()?)

[2.32647]

[2.32780]

            Some(parse_expiry_date(&expiry_date)?)

Deletion in pijul-identity/src/create.rs at line 281 [2.28175]

B:BD[13.7759] → [16.808:903]

    /// * `params.link_remote` - Override if the identity should be exchanged with the remote.

Replacement in pijul-identity/src/create.rs at line 326 [2.28175]

B:BD[6.1857] → [6.1857:1909]

            if self.config != new_identity.config {

[6.1857]

[6.1909]

            if self.config != new_identity.config
                || self.public_key != new_identity.public_key
                || self.last_modified != new_identity.last_modified
            {

Deletion in pijul-config/src/lib.rs at line 242 [17.89866]
B:BD[14.1340] → [14.1340:1394]
```
        .map(|directory| directory.join(CONFIG_FILE))
```
Insertion in pijul/tests/common/identity.rs at line 6 [3.17837]
[3.17928]
[3.17928]
```
    time::Duration,
```
Replacement in pijul/tests/common/identity.rs at line 10 [3.17837]
B:BD[3.17951] → [3.17951:17988]
```
use expectrl::{Session, WaitStatus};
```
[3.17951]
[10.992]
```
use expectrl::{Eof, Session, WaitStatus};
```

Insertion in pijul/tests/common/identity.rs at line 72 [3.17837]

[3.19586]

    fn uses_no_link(&self) -> bool {
        self.login.is_none() && self.origin.is_none() && self.key_path.is_none()
    }

Replacement in pijul/tests/common/identity.rs at line 128 [3.17837]

B:BD[3.21151] → [3.21151:21217]

                generate_command(&config_path, &SubCommand::New),

[3.21151]

[3.21217]

                generate_command(&config_path, &SubCommand::New, existing_id.uses_no_link()),

Insertion in pijul/tests/common/identity.rs at line 379 [3.17837]

[3.28152]

[5.2896]

        if self.uses_no_link() {
            session.set_expect_timeout(Some(Duration::from_secs(1)));
            session.expect(Eof)?;
            return Ok(session.get_process().wait()?);
        }

Replacement in pijul/tests/common/identity.rs at line 436 [3.17837]

B:BD[3.30117] → [3.30117:30242]

            let cli_status =
                self.run_cli_edit(generate_command(&self.config_path, subcmd), false, subcmd)?;

[3.30117]

[11.31]

            let cli_status = self.run_cli_edit(
                generate_command(&self.config_path, subcmd, self.uses_no_link()),
                false,
                subcmd,
            )?;

Replacement in pijul/tests/common/identity.rs at line 446 [3.17837]

B:BD[3.30432] → [3.30432:30548]

        let cli_status =
            self.run_cli_edit(generate_command(&self.config_path, subcmd), true, subcmd)?;

[3.30432]

[11.113]

        let cli_status = self.run_cli_edit(
            generate_command(&self.config_path, subcmd, self.uses_no_link()),
            true,
            subcmd,
        )?;

Replacement in pijul/tests/common/identity.rs at line 456 [3.17837]

B:BD[3.30751] → [3.30751:30869]

        let interactive_status =
            self.run_interactive_edit(generate_command(&self.config_path, subcmd))?;

[3.30751]

[3.30869]

        let interactive_status = self.run_interactive_edit(generate_command(
            &self.config_path,
            subcmd,
            self.uses_no_link(),
        ))?;

Replacement in pijul/tests/common/identity.rs at line 479 [3.17837]

B:BD[3.31440] → [3.31440:31517]

                let pijul_cmd = generate_command(&self.config_path, subcmd);

[3.31440]

[3.31517]

                let pijul_cmd = generate_command(&self.config_path, subcmd, false);

Replacement in pijul/tests/common/identity.rs at line 516 [3.17837]

B:BD[3.32589] → [3.32589:32666]

fn generate_command(config_path: &PathBuf, subcmd: &SubCommand) -> Command {

[3.32589]

[3.32666]

fn generate_command(config_path: &PathBuf, subcmd: &SubCommand, no_link: bool) -> Command {

Replacement in pijul/tests/common/identity.rs at line 524 [3.17837]

B:BD[3.32897] → [3.32897:32950]

    if subcommand == "edit" || subcommand == "new" {

[3.32897]

[3.32950]

    if no_link && (subcommand == "edit" || subcommand == "new") {

Replacement in pijul/src/commands/identity.rs at line 339 [2.40825]

B:BD[8.1972] → [15.2644:2898]

∅:D[15.2898] → [12.3326:3344]

B:BD[12.3326] → [12.3326:3344]

B:BD[12.3344] → [15.2899:2899]

∅:D[15.2899] → [9.4055:4473]

∅:D[12.3344] → [9.4055:4473]

∅:D[13.13915] → [9.4055:4473]

B:BD[8.2063] → [9.4055:4473]

∅:D[9.4473] → [8.2411:2515]

B:BD[8.2411] → [8.2411:2515]

                if let Err(_) = remote::prove(
                    config,
                    &identity,
                    None,
                    self.no_cert_check,
                    !options.no_keyring,
                )
                .await
                {
                    warn!(
                        "Could not prove identity `{}`. Please check your credentials & network connection. If you are on an enterprise network, perhaps try running with `--no-cert-check`. Your data is safe but will not be connected to {} without runnning `pijul identity prove {}`",
                        identity.name, identity.config.author.origin, identity.name
                    );
                } else {
                    info!("Identity `{}` was proved to the server", identity);

[8.1972]

[8.2515]

                if !options.no_link {
                    if let Err(_) = remote::prove(
                        config,
                        &identity,
                        None,
                        self.no_cert_check,
                        !options.no_keyring,
                    )
                    .await
                    {
                        warn!(
                            "Could not prove identity `{}`. Please check your credentials & network connection. If you are on an enterprise network, perhaps try running with `--no-cert-check`. Your data is safe but will not be connected to {} without runnning `pijul identity prove {}`",
                            identity.name, identity.config.author.origin, identity.name
                        );
                    } else {
                        info!("Identity `{}` was proved to the server", identity);
                    }