Files
gitks/repository/find_merge_base.rs
T
zhenyi 934858bebf refactor(cache): redesign cache system with structured keys and improved performance
- Add repo_path parameter to cached_response and cached_vec_response functions
- Implement structured cache key format with namespace, repo_path, and request proto
- Replace global cache with Moka in-memory cache using weight-based eviction
- Set 256MB memory cap with 10-minute TTL and 2-minute TTI policy
- Add metrics collection for cache operations and evictions
- Implement efficient repo-scoped invalidation using key structure
- Add detailed documentation comments explaining cache architecture
- Remove outdated dependencies and update dependency versions
- Add error handling for encoding failures in cache operations
- Optimize Vec responses with length-delimited encoding and pre-allocation
2026-06-12 12:53:23 +08:00

92 lines
2.9 KiB
Rust

use crate::bare::GitBare;
use crate::error::GitResult;
use crate::pb::*;
impl GitBare {
/// Find the best merge base for a set of revisions (OIDs).
pub fn find_merge_base(
&self,
request: FindMergeBaseRequest,
) -> GitResult<FindMergeBaseResponse> {
if request.revisions.is_empty() {
return Ok(FindMergeBaseResponse::default());
}
const MAX_MERGE_BASE_REVISIONS: usize = 64;
if request.revisions.len() > MAX_MERGE_BASE_REVISIONS {
return Err(crate::error::GitError::InvalidArgument(format!(
"too many revisions (max {MAX_MERGE_BASE_REVISIONS})"
)));
}
let revisions: Vec<String> = request
.revisions
.iter()
.map(|b| String::from_utf8_lossy(b).to_string())
.collect();
for revision in &revisions {
crate::sanitize::validate_revision(revision)?;
}
if revisions.len() < 2 {
return Ok(FindMergeBaseResponse {
base_oid: revisions.first().cloned().unwrap_or_default(),
});
}
let mut args = vec![
"--git-dir".to_string(),
self.bare_dir.to_string_lossy().into_owned(),
"merge-base".to_string(),
];
args.extend(revisions.iter().cloned());
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(FindMergeBaseResponse {
base_oid: String::new(),
});
}
let base_oid = String::from_utf8_lossy(&output.stdout).trim().to_string();
Ok(FindMergeBaseResponse { base_oid })
}
/// Check if one commit is an ancestor of another.
pub fn commit_is_ancestor(
&self,
request: CommitIsAncestorRequest,
) -> GitResult<CommitIsAncestorResponse> {
crate::sanitize::validate_revision(&request.ancestor_oid)?;
crate::sanitize::validate_revision(&request.descendant_oid)?;
let result = std::process::Command::new("git")
.args([
"--git-dir",
&self.bare_dir.to_string_lossy(),
"merge-base",
"--is-ancestor",
&request.ancestor_oid,
&request.descendant_oid,
])
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.status()
.map(|s| s.success())
.unwrap_or(false);
Ok(CommitIsAncestorResponse {
is_ancestor: result,
})
}
}