Migrate from `pijul::config` to `pijul-config`

finchie

Jul 13, 2023, 4:16 PM

4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC

Dependencies

• [2] CB7UPUQF Customizable ignore_kinds (and a fix of .write())
• [3] KNSBWC3E Fix compile on Windows
• [4] ABPFWGKH Create `pijul-interaction` crate
• [5] JUYSZJSH Migrate from `pijul::progress` to `pijul_interaction::progress`
• [6] Y6TBQN7M Automatically format `pijul` crate
• [7] 76PCXGML Pushing to, and pulling from the local repository
• [8] YN63NUZO Sanakirja 1.0
• [9] M37JTFEI Restorting SSH auth with a key
• [10] UMF6N7CZ Keyring 2.0
• [11] ZRUPLBBT Colours in diff and change: separating concerns and dependencies
• [12] DWSAYGVE Update codebase to use new identity management
• [13] BNPSVXIC Friendlier progress bars
• [14] TFPETWTV Add config options for patch message templates
• [15] OPC2VAZD Writing an initial config file at initialisation
• [16] MEK57BAD Optional user in ssh_remote, allows to fix the key proof in `pijul id ed`
• [17] H4AU6QRP New config for HTTP remotes
• [18] 4KJ45IJL Implement new identity management
• [19] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [20] KWD6K4F7 Handle absence of keyring for password creation
• [21] Q45QHPO4 Feedback on network stuff
• [22] 4OJWMSOW Fully replace crate::Identity
• [23] LZOGKBJX new command `pijul client` for authenticating to a HTTP server
• [24] A3RM526Y Integrating identity malleability
• [25] I24UEJQL Various post-fire fixes
• [26] DOEG3V7U Only re-write identity data when changed
• [27] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [28] EEBKW7VT Keys and identities
• [29] H72JG6HL Init feature; specific .ignore configs
• [30] 2K7JLB4Z No pager on Windows
• [31] SE4RJYBZ No pager on Windows (really not)
• [32] SLJ3OHD4 unrecord: show list of changes if none were given as arguments
• [33] L4JXJHWX pijul/*: reorganize imports and remove extern crate
• [34] 5BB266P6 Optional colours in the global config file
• [35] EGSVRZJV Avoid converting between base32 and hash in pijul::commands::unrecord
• [36] U6TQX5Z2 pager function respects cli option and user config files, PAGER env var
• [37] GLRGFBCW Checking the version of less we have
• [38] ZSFJT4SF Allow remotes to have a different push and pull address
• [39] TI7PCK7J Update `pijul/src/main.rs` to use new identity management
• [40] FE5ES6Q4 Stop pushing/pulling if the remote returns an error
• [*] 5XMUEZMZ pijul-clone: avoid panics on parsing remote URLs
• [*] 5QTMRUXN Fixing a race condition between progress bars
• [*] 44RUBHRE Only re-prove identity when credentials change
• [*] BV4PLHOV Remove dependency on `once_cell`
• [*] QL6K2ZM3 Tags
• [*] EJ7TFFOW Re-adding Cargo.lock

Change contents

• replacement in pijul/src/repository.rs at line 3
  [7.21541]→[7.5718:5752](∅→∅)
  − use crate::{config, current_dir};
  [7.21541]

  [7.7666]
  + use crate::current_dir;

  + use pijul_config as config;

  +
• replacement in pijul/src/repository.rs at line 218
  [7.984]→[2.144:209](∅→∅)
  − if let Ok((config, _)) = crate::config::Global::load() {
  [7.984]

  [2.209]
  + if let Ok((config, _)) = pijul_config::Global::load() {
• replacement in pijul/src/remote/ssh.rs at line 246
  [7.1319]→[7.1319:1371](∅→∅)
  − crate::config::load_theme()
  [7.1319]

  [7.1371]
  + pijul_config::load_theme()
• replacement in pijul/src/remote/ssh.rs at line 302
  [7.2983]→[7.2983:3027](∅→∅)
  − crate::config::load_theme()
  [7.2983]

  [7.3027]
  + pijul_config::load_theme()
• edit in pijul/src/remote/mod.rs at line 6
  [42.29]

  [43.363]
  + use async_trait::async_trait;
• edit in pijul/src/remote/mod.rs at line 16
  [7.457]→[7.0:22](∅→∅)
  − use crate::config::*;
• edit in pijul/src/remote/mod.rs at line 17
  [7.483]

  [7.52711]
  + use pijul_config::*;
• replacement in pijul/src/remote/mod.rs at line 65
  [7.53370]→[7.205:225](∅→∅)
  − impl RemoteConfig {
  [7.53370]

  [7.225]
  + #[async_trait]

  + pub trait ToRemote {

  + async fn to_remote(

  + &self,

  + channel: &str,

  + no_cert_check: bool,

  + with_path: bool,

  + ) -> Result<RemoteRepo, anyhow::Error>;

  + }

  +

  + #[async_trait]

  + impl ToRemote for RemoteConfig {
• edit in pijul/src/main.rs at line 2
  [7.84222]→[7.84222:84234](∅→∅)
  − mod config;
• replacement in pijul/src/identity/repair.rs at line 2
  [7.364]→[7.171:190](∅→∅),[7.171]→[7.171:190](∅→∅)
  − use crate::config;
  [7.364]

  [7.190]
  + use pijul_config as config;
• replacement in pijul/src/identity/mod.rs at line 46
  [7.17102]→[7.17102:17121](∅→∅),[7.17121]→[7.1970:1997](∅→∅)
  − use crate::config;

  − use crate::config::Author;
  [7.17102]

  [7.17142]
  + use pijul_config as config;

  + use pijul_config::Author;
• replacement in pijul/src/identity/load.rs at line 3
  [7.22467]→[7.22467:22486](∅→∅)
  − use crate::config;
  [7.22467]

  [7.22507]
  + use pijul_config as config;
• edit in pijul/src/identity/create.rs at line 8
  [7.28402]→[6.429:448](∅→∅)
  − use crate::config;
• edit in pijul/src/identity/create.rs at line 12
  [44.101]

  [45.327]
  + use pijul_config as config;
• replacement in pijul/src/commands/unrecord.rs at line 63
  [7.2745]→[7.13401:13464](∅→∅)
  − let (cfg, _) = crate::config::Global::load()?;
  [7.2745]

  [7.2936]
  + let (cfg, _) = pijul_config::Global::load()?;
• replacement in pijul/src/commands/tag.rs at line 280
  [7.13668]→[7.161:229](∅→∅)
  − } else if let Some(_dir) = crate::config::global_config_dir() {
  [7.13668]

  [7.229]
  + } else if let Some(_dir) = pijul_config::global_config_dir() {
• replacement in pijul/src/commands/record.rs at line 217
  [7.796]→[7.293:345](∅→∅),[7.293]→[7.293:345](∅→∅)
  − let config = crate::config::Global::load();
  [7.796]

  [7.2059]
  + let config = pijul_config::Global::load();
• replacement in pijul/src/commands/mod.rs at line 135
  [7.13]→[7.408:546](∅→∅)
  − fn pager(repo_config_pager: Option<&crate::config::Choice>) -> bool {

  − if let Some(crate::config::Choice::Never) = repo_config_pager {
  [7.13]

  [7.546]
  + fn pager(repo_config_pager: Option<&pijul_config::Choice>) -> bool {

  + if let Some(pijul_config::Choice::Never) = repo_config_pager {
• replacement in pijul/src/commands/mod.rs at line 138
  [7.568]→[7.568:653](∅→∅)
  − } else if let Some(crate::config::Choice::Never) = crate::config::Global::load()
  [7.568]

  [7.653]
  + } else if let Some(pijul_config::Choice::Never) = pijul_config::Global::load()
• replacement in pijul/src/commands/mod.rs at line 177
  [7.599]→[3.0:71](∅→∅)
  − fn pager(_repo_config_pager: Option<&crate::config::Choice>) -> bool {
  [7.599]

  [7.192]
  + fn pager(_repo_config_pager: Option<&pijul_config::Choice>) -> bool {
• replacement in pijul/src/commands/identity.rs at line 1
  [7.40825]→[7.40826:40839](∅→∅),[7.40839]→[7.16782:16880](∅→∅),[7.16880]→[7.40929:40932](∅→∅),[7.40929]→[7.40929:40932](∅→∅)
  − use crate::{

  − config::{self, Author},

  − identity::{self, choose_identity_name, fix_identities, Complete},

  − };
  [7.40825]

  [7.40932]
  + use crate::identity::{self, choose_identity_name, fix_identities, Complete};

  + use pijul_config::{self as config, Author};
• replacement in pijul/src/commands/diff.rs at line 351
  [7.400]→[7.2762:2841](∅→∅)
  − pub fn is_colored(repo_config_pager: Option<&crate::config::Choice>) -> bool {
  [7.400]

  [7.430]
  + pub fn is_colored(repo_config_pager: Option<&pijul_config::Choice>) -> bool {
• replacement in pijul/src/commands/diff.rs at line 353
  [7.483]→[7.24071:24132](∅→∅)
  − if let Ok((global, _)) = crate::config::Global::load() {
  [7.483]

  [7.539]
  + if let Ok((global, _)) = pijul_config::Global::load() {
• replacement in pijul/src/commands/diff.rs at line 355
  [7.569]→[7.569:701](∅→∅)
  − Some(crate::config::Choice::Always) => colors = true,

  − Some(crate::config::Choice::Never) => colors = false,
  [7.569]

  [7.701]
  + Some(pijul_config::Choice::Always) => colors = true,

  + Some(pijul_config::Choice::Never) => colors = false,
• replacement in pijul/src/commands/diff.rs at line 360
  [7.760]→[7.760:826](∅→∅)
  − Some(crate::config::Choice::Never) => colors = false,
  [7.760]

  [7.826]
  + Some(pijul_config::Choice::Never) => colors = false,
• edit in pijul/src/commands/client.rs at line 3
  [7.4588]→[6.1883:1921](∅→∅)
  − use crate::config::global_config_dir;
• edit in pijul/src/commands/client.rs at line 5
  [6.2018]

  [7.4588]
  + use pijul_config::global_config_dir;
• edit in pijul/Cargo.toml at line 109
  [7.8483]

  [7.309]
  + async-trait = "0.1"
• edit in pijul/Cargo.toml at line 111
  [7.310]

  [5.4819]
  + pijul-config = { path = "../pijul-config" }
• edit in Cargo.lock at line 2180
  [47.48080]

  [47.48080]
  + "async-trait",
• edit in Cargo.lock at line 2208
  [47.48476]

  [4.551]
  + "pijul-config",