WIP: git::remote_branches

Cargo.toml

@@ -7,6 +7,7 @@ members = [
   "crates/git",
   "crates/forge",
   "crates/forge-forgejo",
+  "crates/forge-github",
   "crates/repo-actor",
 ]
 
@@ -26,6 +27,7 @@ git-next-config = { path = "crates/config" }
 git-next-git = { path = "crates/git" }
 git-next-forge = { path = "crates/forge" }
 git-next-forge-forgejo = { path = "crates/forge-forgejo" }
+git-next-forge-github = { path = "crates/forge-github" }
 git-next-repo-actor = { path = "crates/repo-actor" }
 
 # CLI parsing

crates/config/Cargo.toml

@@ -4,7 +4,7 @@ version = { workspace = true }
 edition = { workspace = true }
 
 [features]
-default = ["forgejo"]
+default = ["forgejo", "github"]
 forgejo = []
 github = []
 

crates/forge-github/Cargo.toml

@@ -0,0 +1,59 @@
+[package]
+name = "git-next-forge-github"
+version = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+git-next-config = { workspace = true }
+git-next-git = { workspace = true }
+
+# logging
+console-subscriber = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+
+# base64 decoding
+base64 = { workspace = true }
+
+# git
+async-trait = { workspace = true }
+
+# fs/network
+kxio = { workspace = true }
+
+# TOML parsing
+serde = { workspace = true }
+serde_json = { workspace = true }
+toml = { workspace = true }
+
+# Secrets and Password
+secrecy = { workspace = true }
+
+# Conventional Commit check
+git-conventional = { workspace = true }
+
+# Webhooks
+bytes = { workspace = true }
+ulid = { workspace = true }
+warp = { workspace = true }
+
+# boilerplate
+derive_more = { workspace = true }
+
+# file watcher
+inotify = { workspace = true }
+
+# # Actors
+# actix = { workspace = true }
+# actix-rt = { workspace = true }
+tokio = { workspace = true }
+
+[dev-dependencies]
+# Testing
+assert2 = { workspace = true }
+
+[lints.clippy]
+nursery = { level = "warn", priority = -1 }
+# pedantic = "warn"
+unwrap_used = "warn"
+expect_used = "warn"

crates/forge-github/src/lib.rs

@@ -0,0 +1,30 @@
+//
+#![allow(dead_code)]
+
+use derive_more::Constructor;
+use git_next_config as config;
+use git_next_git as git;
+
+use kxio::network::Network;
+
+#[cfg(test)]
+mod tests;
+
+#[derive(Clone, Debug, Constructor)]
+pub struct Github {
+    net: Network,
+}
+#[async_trait::async_trait]
+impl git_next_git::ForgeLike for Github {
+    fn name(&self) -> String {
+        "github".to_string()
+    }
+    async fn branches_get_all(&self) -> Result<Vec<config::BranchName>, git::branch::Error> {
+        todo!();
+    }
+
+    /// Checks the results of any (e.g. CI) status checks for the commit.
+    async fn commit_status(&self, _commit: &git::Commit) -> git::commit::Status {
+        todo!();
+    }
+}

crates/forge-github/src/tests/mod.rs

@@ -0,0 +1,8 @@
+use git_next_git::ForgeLike as _;
+
+#[test]
+fn test_name() {
+    let net = kxio::network::Network::new_mock();
+    let forge = crate::Github::new(net);
+    assert_eq!(forge.name(), "github");
+}

crates/forge/Cargo.toml

@@ -4,14 +4,15 @@ version = { workspace = true }
 edition = { workspace = true }
 
 [features]
-default = ["forgejo"]
+default = ["forgejo", "github"]
 forgejo = ["git-next-forge-forgejo"]
-github = []
+github = ["git-next-forge-github"]
 
 [dependencies]
 git-next-config = { workspace = true }
 git-next-git = { workspace = true }
 git-next-forge-forgejo = { workspace = true, optional = true }
+git-next-forge-github = { workspace = true, optional = true }
 
 # logging
 console-subscriber = { workspace = true }

crates/forge/src/github.rs

@@ -1,21 +0,0 @@
-use crate::network::Network;
-
-struct Github;
-pub(super) struct GithubEnv {
-    net: Network,
-}
-impl GithubEnv {
-    pub(crate) const fn new(net: Network) -> GithubEnv {
-        Self { net }
-    }
-}
-#[async_trait::async_trait]
-impl super::ForgeLike for GithubEnv {
-    fn name(&self) -> String {
-        "github".to_string()
-    }
-
-    async fn branches_get_all(&self) -> Vec<super::Branch> {
-        todo!()
-    }
-}

crates/forge/src/lib.rs

@@ -1,34 +1,34 @@
-#![allow(dead_code)]
+//
-
 use git_next_forge_forgejo as forgejo;
+use git_next_forge_github as github;
 use git_next_git as git;
 use kxio::network::Network;
 
-#[cfg(feature = "github")]
-mod github;
-
 mod mock_forge;
 
 #[derive(Clone, Debug)]
 pub enum Forge {
-    Mock(mock_forge::MockForgeEnv),
+    Mock(mock_forge::MockForge),
-    #[allow(clippy::enum_variant_names)]
+
     #[cfg(feature = "forgejo")]
-    ForgeJo(forgejo::ForgeJo),
+    ForgeJo(git_next_forge_forgejo::ForgeJo),
+
     #[cfg(feature = "github")]
-    Github(github::GithubEnv),
+    Github(git_next_forge_github::Github),
 }
 impl Forge {
     pub const fn new_mock() -> Self {
-        Self::Mock(mock_forge::MockForgeEnv::new())
+        Self::Mock(mock_forge::MockForge::new())
     }
+
     #[cfg(feature = "forgejo")]
     pub const fn new_forgejo(repo_details: git::RepoDetails, net: Network) -> Self {
         Self::ForgeJo(forgejo::ForgeJo::new(repo_details, net))
     }
+
     #[cfg(feature = "github")]
     pub const fn new_github(net: Network) -> Self {
-        Self::Github(github::GithubEnv::new(net))
+        Self::Github(github::Github::new(net))
     }
 }
 impl std::ops::Deref for Forge {
@@ -39,7 +39,7 @@ impl std::ops::Deref for Forge {
             #[cfg(feature = "forgejo")]
             Self::ForgeJo(env) => env,
             #[cfg(feature = "github")]
-            Forge::Github(env) => env,
+            Self::Github(env) => env,
         }
     }
 }

crates/forge/src/mock_forge.rs

@@ -1,19 +1,15 @@
 //
 #![cfg(not(tarpaulin_include))]
 
+use derive_more::Constructor;
 use git_next_config as config;
 use git_next_git as git;
 
-struct MockForge;
+#[derive(Clone, Debug, Constructor)]
-#[derive(Clone, Debug)]
+pub struct MockForge;
-pub struct MockForgeEnv;
+
-impl MockForgeEnv {
-    pub(crate) const fn new() -> Self {
-        Self
-    }
-}
 #[async_trait::async_trait]
-impl git::ForgeLike for MockForgeEnv {
+impl git::ForgeLike for MockForge {
     fn name(&self) -> String {
         "mock".to_string()
     }

crates/forge/src/tests/github.rs

@@ -1,8 +0,0 @@
-use super::*;
-
-#[test]
-fn test_name() {
-    let net = Network::new_mock();
-    let forge = Forge::new_github(net);
-    assert_eq!(forge.name(), "github");
-}

crates/forge/src/tests/mod.rs

@@ -4,9 +4,6 @@ use super::*;
 use git_next_config as config;
 use git_next_git as git;
 
-#[cfg(feature = "github")]
-mod github;
-
 #[test]
 fn test_mock_name() {
     let forge = Forge::new_mock();

crates/git/src/branch.rs

@@ -11,6 +11,12 @@ pub enum Error {
     Fetch(git::fetch::Error),
 
     Push(git::push::Error),
+
+    Lock,
+
+    Generic(String),
+    I1(gix::reference::iter::Error),
+    I2(gix::reference::iter::init::Error),
 }
 impl std::error::Error for Error {}
 

crates/git/src/repository/mock.rs

@@ -15,7 +15,7 @@ use crate::{
     },
     GitRemote, RepoDetails,
 };
-use git_next_config::GitDir;
+use git_next_config as config;
 
 #[derive(Debug, Default, Clone)]
 pub struct MockRepository(Arc<Mutex<Reality>>);
@@ -23,7 +23,7 @@ impl MockRepository {
     pub fn new() -> Self {
         Self(Arc::new(Mutex::new(Reality::default())))
     }
-    pub fn can_open_repo(&mut self, gitdir: &GitDir) -> Result<MockOpenRepository> {
+    pub fn can_open_repo(&mut self, gitdir: &config::GitDir) -> Result<MockOpenRepository> {
         self.0
             .lock()
             .map_err(|_| Error::MockLock)
@@ -31,7 +31,7 @@ impl MockRepository {
     }
     fn open_repository(
         &self,
-        gitdir: &GitDir,
+        gitdir: &config::GitDir,
     ) -> std::result::Result<MockOpenRepository, crate::repository::Error> {
         self.0.lock().map_err(|_| Error::MockLock).and_then(|r| {
             r.open_repository(gitdir)
@@ -47,7 +47,7 @@ impl MockRepository {
 impl RepositoryLike for MockRepository {
     fn open(
         &self,
-        gitdir: &GitDir,
+        gitdir: &config::GitDir,
     ) -> std::result::Result<OpenRepository, crate::repository::Error> {
         Ok(OpenRepository::Mock(self.open_repository(gitdir)?))
     }
@@ -62,10 +62,10 @@ impl RepositoryLike for MockRepository {
 
 #[derive(Debug, Default)]
 pub struct Reality {
-    openable_repos: HashMap<GitDir, MockOpenRepository>,
+    openable_repos: HashMap<config::GitDir, MockOpenRepository>,
 }
 impl Reality {
-    pub fn can_open_repo(&mut self, gitdir: &GitDir) -> MockOpenRepository {
+    pub fn can_open_repo(&mut self, gitdir: &config::GitDir) -> MockOpenRepository {
         let mor = self.openable_repos.get(gitdir);
         match mor {
             Some(mor) => mor.clone(),
@@ -76,7 +76,7 @@ impl Reality {
             }
         }
     }
-    pub fn open_repository(&self, gitdir: &GitDir) -> Option<MockOpenRepository> {
+    pub fn open_repository(&self, gitdir: &config::GitDir) -> Option<MockOpenRepository> {
         self.openable_repos.get(gitdir).cloned()
     }
 }
@@ -109,6 +109,12 @@ impl InnerMockOpenRepository {
 
 #[allow(clippy::unwrap_used)]
 impl OpenRepositoryLike for MockOpenRepository {
+    fn remote_branches(&self) -> git::branch::Result<Vec<config::BranchName>> {
+        self.inner
+            .lock()
+            .map(|inner| inner.remote_branches())
+            .unwrap()
+    }
     fn find_default_remote(&self, direction: Direction) -> Option<GitRemote> {
         self.inner
             .lock()
@@ -156,6 +162,9 @@ impl OpenRepositoryLike for MockOpenRepository {
     }
 }
 impl OpenRepositoryLike for InnerMockOpenRepository {
+    fn remote_branches(&self) -> git::branch::Result<Vec<config::BranchName>> {
+        todo!();
+    }
     fn find_default_remote(&self, direction: Direction) -> Option<GitRemote> {
         match direction {
             Direction::Push => self.default_push_remote.clone(),

crates/git/src/repository/open/mod.rs

@@ -28,6 +28,7 @@ impl OpenRepository {
     }
 }
 pub trait OpenRepositoryLike {
+    fn remote_branches(&self) -> git::branch::Result<Vec<config::BranchName>>;
     fn find_default_remote(&self, direction: Direction) -> Option<git::GitRemote>;
     fn fetch(&self) -> Result<(), git::fetch::Error>;
     fn push(

crates/git/src/repository/open/oreal.rs

@@ -1,5 +1,6 @@
 //
 use crate as git;
+use config::BranchName;
 use git_next_config as config;
 
 use gix::bstr::BStr;
@@ -9,6 +10,28 @@ use tracing::{info, warn};
 #[derive(Clone, Debug, derive_more::Constructor)]
 pub struct RealOpenRepository(Arc<Mutex<gix::Repository>>);
 impl super::OpenRepositoryLike for RealOpenRepository {
+    fn remote_branches(&self) -> git::branch::Result<Vec<config::BranchName>> {
+        let refs = self
+            .0
+            .lock()
+            .map_err(|_| git::branch::Error::Lock)
+            .and_then(|repo| {
+                Ok(repo.references()?).and_then(|refs| {
+                    Ok(refs.remote_branches().map(|rb| {
+                        rb.filter_map(|rbi| rbi.ok())
+                            .map(|r| r.name().to_owned())
+                            .map(|n| n.to_string())
+                            .filter_map(|p| {
+                                p.strip_prefix("refs/remotes/origin/").map(|v| v.to_owned())
+                            })
+                            .filter(|b| b.as_str() != "HEAD")
+                            .map(BranchName::new)
+                            .collect::<Vec<_>>()
+                    })?)
+                })
+            })?;
+        Ok(refs)
+    }
     fn find_default_remote(&self, direction: git::repository::Direction) -> Option<git::GitRemote> {
         let Ok(repository) = self.0.lock() else {
             #[cfg(not(tarpaulin_include))] // don't test mutex lock failure

crates/repo-actor/Cargo.toml

@@ -4,7 +4,7 @@ version = { workspace = true }
 edition = { workspace = true }
 
 [features]
-default = ["forgejo"]
+default = ["forgejo", "github"]
 forgejo = []
 github = []
 

crates/repo-actor/src/load.rs

@@ -1,7 +1,7 @@
 //
 use actix::prelude::*;
 
-use tracing::{error, info};
+use tracing::{error, info, warn};
 
 use git_next_config as config;
 use git_next_forge as forge;
@@ -18,7 +18,7 @@ pub async fn load_file(
     open_repository: git::OpenRepository,
 ) {
     info!("Loading .git-next.toml from repo");
-    let repo_config = match load(&repo_details, &forge, open_repository).await {
+    let repo_config = match load(&repo_details, &forge, &open_repository).await {
         Ok(repo_config) => repo_config,
         Err(err) => {
             error!(?err, "Failed to load config");
@@ -32,11 +32,11 @@ pub async fn load_file(
 async fn load(
     details: &git::RepoDetails,
     forge: &forge::Forge,
-    open_repository: git::OpenRepository,
+    open_repository: &git::OpenRepository,
 ) -> Result<config::RepoConfig, Error> {
     let contents = open_repository.read_file(&details.branch, ".git-next.toml")?;
     let config = config::RepoConfig::load(&contents)?;
-    let config = validate(config, forge).await?;
+    let config = validate(config, forge, open_repository).await?;
     Ok(config)
 }
 
@@ -45,18 +45,46 @@ pub enum Error {
     File(git::file::Error),
     Config(config::server::Error),
     Toml(toml::de::Error),
-    Forge(git::branch::Error),
+    Branch(git::branch::Error),
     BranchNotFound(config::BranchName),
 }
 
 pub async fn validate(
     config: config::RepoConfig,
     forge: &forge::Forge,
+    open_repository: &git::OpenRepository,
 ) -> Result<config::RepoConfig, Error> {
+    let new = open_repository.remote_branches();
     let branches = forge.branches_get_all().await.map_err(|e| {
         error!(?e, "Failed to list branches");
-        Error::Forge(e)
+        Error::Branch(e)
-    })?;
+    });
+    let branches = match (branches, new) {
+        (Ok(old), Ok(new)) => {
+            if old == new {
+                info!("remote_branches old and new match");
+            } else {
+                warn!("remote_branches old and new differ:");
+                warn!("old: {old:?}");
+                warn!("new: {new:?}");
+            }
+            Ok(old)
+        }
+        (Ok(old), Err(new)) => {
+            warn!("remote_branches old okay, new error: {new:?}");
+            Ok(old)
+        }
+        (Err(old), Ok(_new)) => {
+            warn!("remote_branches new okay, old error: {old:?}");
+            Err(old)
+        }
+        (Err(old), Err(new)) => {
+            warn!("remote_branches both error:");
+            warn!("old: {old:?}");
+            warn!("new: {new:?}");
+            Err(old)
+        }
+    }?;
     if !branches
         .iter()
         .any(|branch| branch == &config.branches().main())

crates/server/Cargo.toml

@@ -3,11 +3,6 @@ name = "git-next-server"
 version = { workspace = true }
 edition = { workspace = true }
 
-[features]
-default = ["forgejo"]
-forgejo = []
-github = []
-
 [dependencies]
 git-next-config = { workspace = true }
 git-next-git = { workspace = true }