feat(api): extend commit and diff services with new functionality
- Add FindCommit, ListCommitsByOid, CommitIsAncestor RPCs to CommitService - Add CheckObjectsExist, CommitsByMessage, GetCommitStats RPCs to CommitService - Add LastCommitForPath, CountCommits, CountDivergingCommits RPCs to CommitService - Add RawDiff, RawPatch, FindChangedPaths RPCs to DiffService - Add FindMergeBase, WriteRef, SearchFilesByContent RPCs to RepositoryService - Add SearchFilesByName, ObjectsSize, RepositorySize RPCs to RepositoryService - Add FindLicense, OptimizeRepository, GetRawChanges RPCs to RepositoryService - Add FetchRemote, CreateRepositoryFromURL RPCs to RepositoryService - Implement server handlers for all new RPC methods - Add new modules for commit counting, finding, and querying features - Add new modules for diff changed paths and raw operations - Add new modules for refs and remote operations - Remove unnecessary comments from various source files - Update proto definitions with new message types and service methods
This commit is contained in:
zhenyi
@@ -0,0 +1,94 @@
|
||||
use crate::error::GitResult;
|
||||
use crate::pb::*;
|
||||
|
||||
/// Discover remote refs via `git ls-remote`.
|
||||
pub fn find_remote_repository(request: FindRemoteRepositoryRequest) -> GitResult<FindRemoteRepositoryResponse> {
|
||||
if request.remote_url.is_empty() {
|
||||
return Ok(FindRemoteRepositoryResponse { refs: vec![], exists: false });
|
||||
}
|
||||
|
||||
let output = std::process::Command::new("git")
|
||||
.args(["ls-remote", "--symref", &request.remote_url])
|
||||
.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.output()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
|
||||
if !output.status.success() {
|
||||
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||
if stderr.contains("Could not resolve host") || stderr.contains("Repository not found") {
|
||||
return Ok(FindRemoteRepositoryResponse { refs: vec![], exists: false });
|
||||
}
|
||||
return Ok(FindRemoteRepositoryResponse { refs: vec![], exists: false });
|
||||
}
|
||||
|
||||
let stdout = String::from_utf8_lossy(&output.stdout);
|
||||
let mut refs = Vec::new();
|
||||
|
||||
for line in stdout.lines() {
|
||||
let line = line.trim();
|
||||
if line.is_empty() {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Lines can be:
|
||||
// SHA<TAB>refname (direct ref)
|
||||
// ref: refs/heads/main<TAB>HEAD (symbolic ref via --symref)
|
||||
if line.starts_with("ref:") {
|
||||
if let Some((target, name)) = line.split_once('\t') {
|
||||
refs.push(RemoteHead {
|
||||
ref_name: name.to_string(),
|
||||
target_oid: String::new(),
|
||||
symbolic: true,
|
||||
symbolic_target: target.strip_prefix("ref:").unwrap_or(target).trim().to_string(),
|
||||
});
|
||||
}
|
||||
} else if let Some((oid, name)) = line.split_once('\t') {
|
||||
refs.push(RemoteHead {
|
||||
ref_name: name.to_string(),
|
||||
target_oid: oid.to_string(),
|
||||
symbolic: false,
|
||||
symbolic_target: String::new(),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(FindRemoteRepositoryResponse { refs, exists: true })
|
||||
}
|
||||
|
||||
/// Find the root ref (HEAD) of a remote repository.
|
||||
pub fn find_remote_root_ref(request: FindRemoteRootRefRequest) -> GitResult<FindRemoteRootRefResponse> {
|
||||
let output = std::process::Command::new("git")
|
||||
.args(["ls-remote", "--symref", &request.remote_url, "HEAD"])
|
||||
.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.output()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
|
||||
let stdout = String::from_utf8_lossy(&output.stdout);
|
||||
for line in stdout.lines() {
|
||||
let line = line.trim();
|
||||
if line.starts_with("ref:") {
|
||||
if let Some((target, _name)) = line.split_once('\t') {
|
||||
let ref_name = target.strip_prefix("ref:").unwrap_or(target).trim().to_string();
|
||||
return Ok(FindRemoteRootRefResponse {
|
||||
ref_name,
|
||||
target_oid: String::new(),
|
||||
});
|
||||
}
|
||||
} else if let Some((oid, name)) = line.split_once('\t') {
|
||||
return Ok(FindRemoteRootRefResponse {
|
||||
ref_name: name.to_string(),
|
||||
target_oid: oid.to_string(),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(FindRemoteRootRefResponse::default())
|
||||
}
|
||||
@@ -0,0 +1,222 @@
|
||||
use crate::bare::GitBare;
|
||||
use crate::error::GitResult;
|
||||
use crate::pb::*;
|
||||
|
||||
impl GitBare {
|
||||
/// Update mirror from a remote URL (fetch + update all refs).
|
||||
pub fn update_remote_mirror(&self, request: UpdateRemoteMirrorRequest) -> GitResult<UpdateRemoteMirrorResponse> {
|
||||
let remote_name = if request.remote_name.is_empty() { "origin" } else { &request.remote_name };
|
||||
|
||||
// Add or update remote
|
||||
let remote_check = std::process::Command::new("git")
|
||||
.args([
|
||||
"--git-dir",
|
||||
&self.bare_dir.to_string_lossy(),
|
||||
"remote",
|
||||
"get-url",
|
||||
remote_name,
|
||||
])
|
||||
.output();
|
||||
|
||||
if remote_check.is_err() || !remote_check.unwrap().status.success() {
|
||||
// Add new remote
|
||||
std::process::Command::new("git")
|
||||
.args([
|
||||
"--git-dir",
|
||||
&self.bare_dir.to_string_lossy(),
|
||||
"remote",
|
||||
"add",
|
||||
remote_name,
|
||||
&request.remote_url,
|
||||
])
|
||||
.output()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
} else {
|
||||
// Update existing remote URL
|
||||
std::process::Command::new("git")
|
||||
.args([
|
||||
"--git-dir",
|
||||
&self.bare_dir.to_string_lossy(),
|
||||
"remote",
|
||||
"set-url",
|
||||
remote_name,
|
||||
&request.remote_url,
|
||||
])
|
||||
.output()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
}
|
||||
|
||||
// Fetch
|
||||
let mut fetch_args = vec![
|
||||
"--git-dir".to_string(),
|
||||
self.bare_dir.to_string_lossy().into_owned(),
|
||||
"fetch".to_string(),
|
||||
remote_name.to_string(),
|
||||
];
|
||||
|
||||
if request.prune {
|
||||
fetch_args.push("--prune".to_string());
|
||||
}
|
||||
if request.force {
|
||||
fetch_args.push("--force".to_string());
|
||||
}
|
||||
|
||||
if request.refspecs.is_empty() {
|
||||
fetch_args.push("+refs/*:refs/*".to_string());
|
||||
} else {
|
||||
for rs in &request.refspecs {
|
||||
fetch_args.push(rs.clone());
|
||||
}
|
||||
}
|
||||
|
||||
let output = std::process::Command::new("git")
|
||||
.args(&fetch_args)
|
||||
.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.output()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
|
||||
if !output.status.success() {
|
||||
return Ok(UpdateRemoteMirrorResponse {
|
||||
ok: false,
|
||||
error: String::from_utf8_lossy(&output.stderr).trim().to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
// Update local HEAD to match remote HEAD
|
||||
let head_output = std::process::Command::new("git")
|
||||
.args([
|
||||
"--git-dir",
|
||||
&self.bare_dir.to_string_lossy(),
|
||||
"remote",
|
||||
"set-head",
|
||||
remote_name,
|
||||
"--auto",
|
||||
])
|
||||
.output();
|
||||
|
||||
if let Ok(out) = head_output {
|
||||
if !out.status.success() {
|
||||
tracing::warn!(
|
||||
repo = %self.bare_dir.display(),
|
||||
stderr = %String::from_utf8_lossy(&out.stderr).trim(),
|
||||
"failed to auto-set remote HEAD"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(UpdateRemoteMirrorResponse { ok: true, error: String::new() })
|
||||
}
|
||||
|
||||
/// Fetch from a remote URL without mirroring.
|
||||
pub fn fetch_remote(&self, request: FetchRemoteRequest) -> GitResult<FetchRemoteResponse> {
|
||||
let remote_name = if request.remote_name.is_empty() { "origin" } else { &request.remote_name };
|
||||
|
||||
// Ensure remote exists
|
||||
let exists = std::process::Command::new("git")
|
||||
.args([
|
||||
"--git-dir",
|
||||
&self.bare_dir.to_string_lossy(),
|
||||
"remote",
|
||||
"get-url",
|
||||
remote_name,
|
||||
])
|
||||
.output()
|
||||
.map(|o| o.status.success())
|
||||
.unwrap_or(false);
|
||||
|
||||
if !exists {
|
||||
std::process::Command::new("git")
|
||||
.args([
|
||||
"--git-dir",
|
||||
&self.bare_dir.to_string_lossy(),
|
||||
"remote",
|
||||
"add",
|
||||
remote_name,
|
||||
&request.remote_url,
|
||||
])
|
||||
.output()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
}
|
||||
|
||||
let mut args = vec![
|
||||
"--git-dir".to_string(),
|
||||
self.bare_dir.to_string_lossy().into_owned(),
|
||||
"fetch".to_string(),
|
||||
remote_name.to_string(),
|
||||
];
|
||||
|
||||
if request.prune { args.push("--prune".to_string()); }
|
||||
if request.force { args.push("--force".to_string()); }
|
||||
|
||||
if request.refspecs.is_empty() {
|
||||
args.push("+refs/heads/*:refs/heads/*".to_string());
|
||||
args.push("+refs/tags/*:refs/tags/*".to_string());
|
||||
} else {
|
||||
for rs in &request.refspecs {
|
||||
args.push(rs.clone());
|
||||
}
|
||||
}
|
||||
|
||||
let output = std::process::Command::new("git")
|
||||
.args(&args)
|
||||
.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.output()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
|
||||
if !output.status.success() {
|
||||
return Ok(FetchRemoteResponse {
|
||||
ok: false,
|
||||
error: String::from_utf8_lossy(&output.stderr).trim().to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
Ok(FetchRemoteResponse { ok: true, error: String::new() })
|
||||
}
|
||||
|
||||
/// Clone a repository from a remote URL (bare + mirror).
|
||||
pub fn create_repository_from_url(&self, remote_url: &str, mirror: bool) -> GitResult<()> {
|
||||
let mut args = vec!["clone".to_string()];
|
||||
args.push("--bare".to_string());
|
||||
if mirror {
|
||||
args.push("--mirror".to_string());
|
||||
}
|
||||
args.push(remote_url.to_string());
|
||||
args.push(self.bare_dir.to_string_lossy().into_owned());
|
||||
|
||||
let result = duct::cmd("git", &args)
|
||||
.stdout_capture()
|
||||
.stderr_capture()
|
||||
.unchecked()
|
||||
.run()
|
||||
.map_err(|e| crate::error::GitError::CommandFailed {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
|
||||
if !result.status.success() {
|
||||
return Err(crate::error::GitError::CommandFailed {
|
||||
status_code: result.status.code(),
|
||||
stderr: String::from_utf8_lossy(&result.stderr).into_owned(),
|
||||
});
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
pub mod find_remote;
|
||||
pub mod mirror;
|
||||
Reference in New Issue
Block a user