Remove password store & clean lint warnings

Remove password store as we no longer need it since we aren't collecting
the credentials for ssh signing anymore. I also cleaned up a bunch of
lint warnings that were largely caused by poor code organization.

I also removed a couple dependencies that are no longer needed
since the shift of the ssh signing to an external command.

<!-- ps-id: 2e704aaf-e058-4ad9-a4a9-160b85c131ce -->

Cargo.toml

@@ -26,9 +26,7 @@ toml = "0.8.8"
 ansi_term = { version = "0.12.1", features = ["derive_serde_style"] }
 ureq = "2.4.0"
 version-compare = "0.1.0"
-rpassword = "7.2.0"
 clap = { version = "4.4.6", features = ["derive"] }
-keyring = "2"
 tempfile = "3.3.0"
 
 [build-dependencies]

src/ps/private/config/branch_config_dto.rs → src/ps/private/config/branch/branch_config_dto.rs

@@ -1,4 +1,4 @@
-use super::super::utils;
+use super::super::super::utils;
 use serde::Deserialize;
 use std::option::Option;
 

src/ps/private/config/branch/mod.rs

@@ -0,0 +1,3 @@
+mod branch_config_dto;
+
+pub use branch_config_dto::*;

src/ps/private/config/config_dto.rs

@@ -1,10 +1,10 @@
 use super::super::utils;
-use super::branch_config_dto::*;
-use super::fetch_config_dto::*;
-use super::integrate_config_dto::*;
-use super::list_config_dto::*;
-use super::pull_config_dto::*;
-use super::request_review_config_dto::*;
+use super::branch::BranchConfigDto;
+use super::fetch::FetchConfigDto;
+use super::integrate::IntegrateConfigDto;
+use super::list::ListConfigDto;
+use super::pull::PullConfigDto;
+use super::request_review::RequestReviewConfigDto;
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Default)]

src/ps/private/config/fetch_config_dto.rs → src/ps/private/config/fetch/fetch_config_dto.rs

@@ -1,4 +1,4 @@
-use super::super::utils;
+use super::super::super::utils;
 use serde::Deserialize;
 use std::option::Option;
 

src/ps/private/config/fetch/mod.rs

@@ -0,0 +1,3 @@
+mod fetch_config_dto;
+
+pub use fetch_config_dto::*;

src/ps/private/config/get_config.rs

@@ -1,17 +1,17 @@
 use super::super::paths;
 use super::super::utils::*;
-use super::branch_config_dto::BranchConfigDto;
+use super::branch::BranchConfigDto;
 use super::config_dto::ConfigDto;
-use super::fetch_config_dto::FetchConfigDto;
-use super::integrate_config_dto::IntegrateConfigDto;
-use super::list_config_dto::{ColorWithAlternate, ListConfigDto};
+use super::fetch::FetchConfigDto;
+use super::integrate::IntegrateConfigDto;
+use super::list::{ColorWithAlternate, ListConfigDto};
 use super::ps_config::{
     PsBranchConfig, PsConfig, PsFetchConfig, PsIntegrateConfig, PsListConfig, PsPullConfig,
     PsRequestReviewConfig,
 };
-use super::pull_config_dto::PullConfigDto;
+use super::pull::PullConfigDto;
 use super::read_config_or_default::*;
-use super::request_review_config_dto::RequestReviewConfigDto;
+use super::request_review::RequestReviewConfigDto;
 use ansi_term::Color;
 
 #[derive(Debug)]

src/ps/private/config/integrate_config_dto.rs → src/ps/private/config/integrate/integrate_config_dto.rs

@@ -1,4 +1,4 @@
-use super::super::utils;
+use super::super::super::utils;
 use serde::Deserialize;
 use std::option::Option;
 

src/ps/private/config/integrate/mod.rs

@@ -0,0 +1,3 @@
+mod integrate_config_dto;
+
+pub use integrate_config_dto::*;

src/ps/private/config/list_config_dto.rs → src/ps/private/config/list/list_config_dto.rs

@@ -1,4 +1,4 @@
-use super::super::utils;
+use super::super::super::utils;
 use ansi_term::Color;
 use serde::Deserialize;
 use std::option::Option;

src/ps/private/config/list/mod.rs

@@ -0,0 +1,3 @@
+mod list_config_dto;
+
+pub use list_config_dto::*;

src/ps/private/config/mod.rs

@@ -1,18 +1,15 @@
-mod branch_config_dto;
+pub mod branch;
+pub mod fetch;
+pub mod integrate;
+pub mod list;
+pub mod pull;
+pub mod request_review;
+
 mod config_dto;
-mod fetch_config_dto;
 mod get_config;
-mod integrate_config_dto;
-mod list_config_dto;
 mod ps_config;
-mod pull_config_dto;
 mod read_config;
 mod read_config_or_default;
-mod request_review_config_dto;
 
-pub use branch_config_dto::*;
 pub use config_dto::*;
 pub use get_config::*;
-pub use ps_config::*;
-pub use request_review_config_dto::*;
-pub use list_config_dto::ColorSelector;

src/ps/private/config/ps_config.rs

@@ -1,4 +1,4 @@
-use super::list_config_dto::ColorWithAlternate;
+use super::list::ColorWithAlternate;
 
 #[derive(Debug)]
 pub struct PsConfig {

src/ps/private/config/pull/mod.rs

@@ -0,0 +1,3 @@
+mod pull_config_dto;
+
+pub use pull_config_dto::*;

src/ps/private/config/pull_config_dto.rs → src/ps/private/config/pull/pull_config_dto.rs

@@ -1,4 +1,4 @@
-use super::super::utils;
+use super::super::super::utils;
 use serde::Deserialize;
 use std::option::Option;
 

src/ps/private/config/read_config.rs

@@ -1,4 +1,4 @@
-use super::config_dto::*;
+use super::ConfigDto;
 use std::fs;
 use std::io;
 use std::path;

src/ps/private/config/request_review/mod.rs

@@ -0,0 +1,3 @@
+mod request_review_config_dto;
+
+pub use request_review_config_dto::*;

src/ps/private/config/request_review_config_dto.rs → src/ps/private/config/request_review/request_review_config_dto.rs

@@ -1,4 +1,4 @@
-use super::super::utils;
+use super::super::super::utils;
 use serde::Deserialize;
 use std::option::Option;
 

src/ps/private/git.rs

@@ -31,10 +31,7 @@ mod branch_upstream_name;
 mod commit_diff;
 mod commit_diff_patch_id;
 mod common_ancestor;
-mod config_get_bool;
-mod config_get_error;
-mod config_get_string;
-mod config_get_to_option;
+pub mod config;
 mod count_commits;
 mod create_commit;
 mod create_cwd_repo;
@@ -58,7 +55,7 @@ mod line_to_rebase_todo;
 #[cfg(feature = "backup_cmd")]
 mod read_hashed_object;
 mod rebase_todo;
-mod signers;
+pub mod signers;
 mod str_to_rebase_todos;
 #[cfg(test)]
 mod test_utils;
@@ -68,15 +65,9 @@ pub use branch_upstream_name::*;
 pub use commit_diff::*;
 pub use commit_diff_patch_id::*;
 pub use common_ancestor::*;
-pub use config_get_bool::*;
-pub use config_get_error::*;
-pub use config_get_string::*;
-pub use config_get_to_option::*;
 pub use count_commits::*;
 pub use create_commit::*;
 pub use create_cwd_repo::*;
-pub use create_signed_commit::*;
-pub use create_unsigned_commit::*;
 pub use ext_delete_remote_branch::*;
 pub use ext_fetch::*;
 pub use ext_push::*;
@@ -95,6 +86,5 @@ pub use line_to_rebase_todo::*;
 #[cfg(feature = "backup_cmd")]
 pub use read_hashed_object::*;
 pub use rebase_todo::*;
-pub use signers::*;
 pub use str_to_rebase_todos::*;
 pub use uncommited_changes_exist::*;

src/ps/private/git/config_get_bool.rs → src/ps/private/git/config/config_get_bool.rs

@@ -1,5 +1,4 @@
-use super::config_get_error::ConfigGetError;
-use super::config_get_to_option::config_get_to_option;
+use super::{config_get_to_option, ConfigGetError};
 use git2;
 use std::result::Result;
 

src/ps/private/git/config_get_string.rs → src/ps/private/git/config/config_get_string.rs

@@ -1,5 +1,4 @@
-use super::config_get_error::ConfigGetError;
-use super::config_get_to_option::config_get_to_option;
+use super::{config_get_to_option, ConfigGetError};
 
 pub fn config_get_string(
     config: &git2::Config,

src/ps/private/git/config/mod.rs

@@ -0,0 +1,9 @@
+mod config_get_bool;
+mod config_get_error;
+mod config_get_string;
+mod config_get_to_option;
+
+pub use config_get_bool::*;
+pub use config_get_error::*;
+pub use config_get_string::*;
+pub use config_get_to_option::*;

src/ps/private/git/create_commit.rs

@@ -1,6 +1,4 @@
-use super::config_get_bool::config_get_bool;
-use super::config_get_error::ConfigGetError;
-use super::config_get_string::config_get_string;
+use super::config::{config_get_bool, config_get_string, ConfigGetError};
 use super::create_signed_commit::{create_signed_commit, CreateSignedCommitError};
 use super::create_unsigned_commit::{create_unsigned_commit, CreateUnsignedCommitError};
 use super::signers;

src/ps/private/git/signers/signer_error.rs

@@ -1,12 +1,4 @@
-use super::super::super::password_store;
-
 #[derive(Debug)]
 pub enum SignerError {
-    KeyParsing(Box<dyn std::error::Error>),
-    ReadPassword(std::io::Error),
-    KeyDecryption(Box<dyn std::error::Error>),
     Signing(Box<dyn std::error::Error>),
-    SignatureFormatting(Box<dyn std::error::Error>),
-    GetPassword(password_store::GetSshKeyPasswordError),
-    SetPassword(password_store::SetSshKeyPasswordError),
 }

src/ps/private/mod.rs

@@ -5,7 +5,6 @@ pub mod config;
 pub mod git;
 pub mod hooks;
 pub mod list;
-pub mod password_store;
 pub mod paths;
 pub mod state_computation;
 pub mod string_file_io;

src/ps/private/utils/mod.rs

@@ -5,7 +5,7 @@ mod string_manipulation;
 
 pub use execute::{
     execute, execute_with_input_and_output, execute_with_output, ExecuteError,
-    ExecuteWithInputAndOutputError, ExecuteWithOutputError,
+    ExecuteWithOutputError,
 };
 pub use mergable::merge_option;
 pub use mergable::Mergable;

src/ps/public/list.rs

@@ -1,6 +1,6 @@
 use super::super::super::ps;
 use super::super::private::config;
-use super::super::private::config::ColorSelector;
+use super::super::private::config::list::ColorSelector;
 use super::super::private::git;
 use super::super::private::git::RebaseTodoCommand;
 use super::super::private::list;