use crate::pb::*; use super::{GitksService, into_status}; #[tonic::async_trait] impl merge_service_server::MergeService for GitksService { async fn check_merge( &self, request: tonic::Request, ) -> Result, tonic::Status> { let inner = request.into_inner(); let repo = self.repo_label(inner.repository.as_ref()); let span = tracing::info_span!("merge.check_merge", %repo); let _enter = span.enter(); let gb = self.resolve(inner.repository.as_ref())?; let resp = gb.check_merge(inner).map_err(into_status)?; tracing::info!(%repo, status = resp.status, "check_merge done"); Ok(tonic::Response::new(resp)) } async fn merge( &self, request: tonic::Request, ) -> Result, tonic::Status> { let inner = request.into_inner(); let repo = self.repo_label(inner.repository.as_ref()); let target = inner.target_branch.clone(); let span = tracing::info_span!("merge.merge", %repo, %target); let _enter = span.enter(); let gb = self.resolve(inner.repository.as_ref())?; let resp = gb.merge(inner).map_err(into_status)?; tracing::info!(%repo, %target, status = resp.status, "merge done"); Ok(tonic::Response::new(resp)) } async fn list_merge_conflicts( &self, request: tonic::Request, ) -> Result, tonic::Status> { let inner = request.into_inner(); let repo = self.repo_label(inner.repository.as_ref()); let span = tracing::info_span!("merge.list_merge_conflicts", %repo); let _enter = span.enter(); let gb = self.resolve(inner.repository.as_ref())?; let resp = gb.list_merge_conflicts(inner).map_err(into_status)?; tracing::info!(%repo, conflicts = resp.conflicts.len(), "list_merge_conflicts done"); Ok(tonic::Response::new(resp)) } async fn resolve_merge_conflicts( &self, request: tonic::Request, ) -> Result, tonic::Status> { let inner = request.into_inner(); let repo = self.repo_label(inner.repository.as_ref()); let target = inner.target_branch.clone(); let span = tracing::info_span!("merge.resolve_merge_conflicts", %repo, %target); let _enter = span.enter(); let gb = self.resolve(inner.repository.as_ref())?; let resp = gb.resolve_merge_conflicts(inner).map_err(into_status)?; tracing::info!(%repo, %target, status = resp.status, "merge conflicts resolved"); Ok(tonic::Response::new(resp)) } async fn rebase( &self, request: tonic::Request, ) -> Result, tonic::Status> { let inner = request.into_inner(); let repo = self.repo_label(inner.repository.as_ref()); let branch = inner.branch.clone(); let span = tracing::info_span!("merge.rebase", %repo, %branch); let _enter = span.enter(); let gb = self.resolve(inner.repository.as_ref())?; let resp = gb.rebase(inner).map_err(into_status)?; tracing::info!(%repo, %branch, status = resp.status, "rebase done"); Ok(tonic::Response::new(resp)) } }