Fixing conflicts

Dependencies

• [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [3] FDPGJDXV Compiling Thrussh with feature OpenSSL by default
• [4] 4KJ45IJL Implement new identity management
• [5] 4OJWMSOW Fully replace crate::Identity
• [6] 44RUBHRE Only re-prove identity when credentials change
• [7] 5Z2Y7VGV Migrate `pijul::identity::Complete::prove` to `pijul::remote::prove`
• [8] WTPFQPO5 Add global `no_prompt` flag
• [9] OYN2YVPA Create `pijul_remote` crate
• [10] 2MKP7CB7 Move dependencies into workspace `Cargo.toml`
• [11] TCXM4WIJ Remove unused dependencies
• [12] MBIKZPCC Add flags to disable the use of the system keyring, asking to prompt the key password directly instead
• [13] YW6NICQV Migrate codebase to refactored `pijul_config` crate
• [14] 7JTKP74V Fixing a conflict
• [15] ZPLT3HRL Fix error in identity new by skipping any prompting when no-prompt is set
• [16] S37MK5VY Correctly enable OpenSSL feature
• [17] DOEG3V7U Only re-write identity data when changed
• [18] HGJETVAN Create `pijul_config::global_config_directory()`
• [19] SPA2OL5I keep-changes feature (default) to avoid deleting problematic changes
• [20] KKNMDXAI Tweak identity subcommand

Change contents

• edit in pijul-remote/Cargo.toml at line 14
  [9.874]→[16.0:68](∅→∅)
  − [features]

  − openssl = [ "thrussh/openssl", "thrussh-keys/openssl" ]

  −
• replacement in pijul-identity/src/repair.rs at line 69
  [14.433]→[14.433:488](∅→∅)
  − .create(config, true, use_keyring)
  [14.433]

  [14.488]
  + .create(config, false, true, use_keyring)
• replacement in pijul-identity/src/repair.rs at line 96
  [14.569]→[14.569:632](∅→∅)
  − .create(config, true, use_keyring)
  [14.569]

  [14.632]
  + .create(config, false, true, use_keyring)
• edit in pijul-identity/src/repair.rs at line 98
  [4.6256]→[15.66:139](∅→∅)
  − Complete::default()?.create(false, true).await?;
• resolve order conflict in pijul-identity/src/repair.rs at line 98
  [14.669]

  [4.6333]
• edit in pijul-identity/src/repair.rs at line 311
  [4.4220]→[15.0:65](∅→∅),[4.4220]→[15.0:65](∅→∅)
  − old_identity.clone().create(false, true).await?;
• resolve order conflict in pijul-identity/src/repair.rs at line 311
  [4.15595]
• edit in pijul-identity/src/create.rs at line 270
  [13.7839]

  [13.7839]
  + no_prompt: bool,
• edit in pijul-identity/src/create.rs at line 274
  [4.38529]→[15.140:238](∅→∅),[15.238]→[5.14019:14076](∅→∅),[8.713]→[5.14019:14076](∅→∅),[12.1764]→[5.14019:14076](∅→∅),[6.1818]→[5.14019:14076](∅→∅),[13.7903]→[5.14019:14076](∅→∅),[5.14019]→[5.14019:14076](∅→∅),[5.14076]→[14.1756:1883](∅→∅)
  − pub async fn create(&self, no_prompt: bool, link_remote: bool) -> Result<(), anyhow::Error> {

  − // Prompt the user to edit changes interactively

  − let confirmed_identity = self

  − .prompt_changes(config, None, link_remote, use_keyring)

  − .await?;
• resolve order conflict in pijul-identity/src/create.rs at line 274
  [13.7903]

  [15.239]
• replacement in pijul-identity/src/create.rs at line 278
  [15.352]→[15.352:431](∅→∅)
  − prompted_identity = self.prompt_changes(None, link_remote).await?;
  [15.352]

  [15.431]
  + prompted_identity = self

  + .prompt_changes(config, None, link_remote, use_keyring)

  + .await?;
• replacement in pijul/src/commands/identity.rs at line 275
  [12.3099]→[14.2567:2642](∅→∅)
  − .create(config, !options.no_link, !options.no_keyring)
  [12.3099]

  [12.3166]
  + .create(

  + config,

  + options.no_prompt,

  + !options.no_link,

  + !options.no_keyring,

  + )
• edit in pijul/src/commands/identity.rs at line 282
  [12.3195]→[14.2643:2643](∅→∅),[4.49307]→[15.474:551](∅→∅)
  −

  − identity.create(options.no_prompt, !options.no_link).await?;
• resolve order conflict in pijul/src/commands/identity.rs at line 282
  [12.3195]

  [7.1971]
• resurrect zombie in pijul/src/commands/identity.rs at line 505
  [14.3372]→[12.4559:4579](∅→∅),[12.4559]→[12.4559:4579](∅→∅),[12.4559]→[12.4559:4579](∅→∅)
  + )?;
• edit in pijul/src/commands/identity.rs at line 506
  [12.4579]→[14.3373:3373](∅→∅),[12.4579]→[14.3373:3373](∅→∅)
  −
• edit in pijul/Cargo.toml at line 16
  [3.68]→[16.69:149](∅→∅),[3.68]→[16.69:149](∅→∅)
  − openssl = [ "thrussh/openssl", "thrussh-keys/openssl", "pijul-remote/openssl" ]
• resolve order conflict in pijul/Cargo.toml at line 16
  [11.150]

  [2.197365]