use super::service_fault::reach;
use super::service_head::head_names;
use super::service_instance::instance_of;
use super::service_pruned::batch_content_missing;
use super::service_journal::{Intent, Recovery, list_intents, mark_done, recovery_for, write_intent, OPEN_EXTENSION};
use super::service_index_lock::{Announce, IndexLock, acquire_noting_holder, remove_stale, try_acquire};
use super::service_timing::LandTiming;
use super::service_land_follow::{IndexPaths, build_index, classify, remove_conclusion_state, storage_failure};
use super::service_protocol::{CommitRequest, FailureCode, is_zero_object};
use super::transaction_git::{GitContext, GitOutput, GitRequest, run_git};
use std::collections::{BTreeSet, HashMap};
use std::path::{Path, PathBuf};
use std::time::Instant;
pub const LANDING_ATTEMPTS: usize = 3;
pub struct LandContext {
pub git: GitContext,
pub journal: PathBuf,
pub on_objects_written: Option<Box<dyn Fn() + Send + Sync>>,
pub index_wait: std::time::Duration,
}
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum Outcome {
Landed { commit: String },
RetryPrepare { base: String },
BranchMoved,
}
fn run(git: &GitContext, repository: &Path, arguments: &[&str], input: Option<Vec<u8>>) -> Result<GitOutput, FailureCode> {
let mut request: GitRequest = GitRequest::new(repository, arguments);
request.input = input;
let output: GitOutput = run_git(git, &request).map_err(|_| { return FailureCode::Unavailable; })?;
return Ok(output);
}
fn checked(git: &GitContext, repository: &Path, arguments: &[&str], input: Option<Vec<u8>>) -> Result<String, FailureCode> {
let output: GitOutput = run(git, repository, arguments, input)?;
if !output.succeeded() {
return Err(classify(&output));
}
return Ok(String::from_utf8_lossy(output.stdout.as_slice()).trim().to_string());
}
fn quoted(path: &str) -> String {
let mut text: String = String::from("\"");
for character in path.chars() {
match character {
'"' => text.push_str("\\\""),
'\\' => text.push_str("\\\\"),
other => text.push(other),
}
}
text.push('"');
return text;
}
fn overlaps(path: &str, changed: &str) -> bool {
return path == changed || path.starts_with(&format!("{changed}/")) || changed.starts_with(&format!("{path}/"));
}
fn import_stream(scratch: &str, old: &str, requests: &[&CommitRequest], amended_parents: &[String]) -> Vec<u8> {
let mut bytes: Vec<u8> = Vec::new();
for (index, request) in requests.iter().enumerate() {
bytes.extend(format!("commit {scratch}\nmark :{}\n", index + 1).as_bytes());
if let Some(author) = &request.author {
bytes.extend(format!("author {author}\n").as_bytes());
}
bytes.extend(format!("committer {}\ndata {}\n", request.committer, request.message.len()).as_bytes());
bytes.extend(request.message.as_bytes());
bytes.push(b'\n');
if let Some(tree) = request.tree.as_deref().filter(|_| { return request.amend; }) {
for (position, parent) in amended_parents.iter().enumerate() {
bytes.extend(format!("{} {parent}\n", if position == 0 { "from" } else { "merge" }).as_bytes());
}
bytes.extend(format!("M 040000 {tree} \"\"\n").as_bytes());
bytes.push(b'\n');
continue;
}
if index == 0 {
bytes.extend(format!("from {old}\n").as_bytes());
}
for change in &request.changes {
match &change.blob {
Some(blob) => bytes.extend(format!("M {:o} {blob} {}\n", change.mode, quoted(change.path.as_str())).as_bytes()),
None => bytes.extend(format!("D {}\n", quoted(change.path.as_str())).as_bytes()),
}
}
bytes.push(b'\n');
}
bytes.extend(b"done\n");
return bytes;
}
fn commits_from_marks(text: &str, count: usize) -> Option<Vec<String>> {
let mut commits: Vec<Option<String>> = vec![None; count];
for line in text.lines() {
let mut parts = line.split(' ');
let (Some(mark), Some(name)) = (parts.next(), parts.next()) else { continue };
let slot: usize = mark.trim_start_matches(':').parse::<usize>().ok()?;
if slot >= 1 && slot <= count {
commits[slot - 1] = Some(name.to_string());
}
}
return commits.into_iter().collect();
}
fn intent_paths(intent: &Intent) -> IndexPaths<'_> {
return if intent.derived { IndexPaths::Derived { old: intent.old.as_str() } } else { IndexPaths::Listed(intent.paths.as_slice()) };
}
fn follow_up(git: &GitContext, repository: &Path, intent: &Intent, lock: IndexLock) -> bool {
let cleaned: bool = intent.cleanup.as_ref().is_none_or(|cleanup| { return remove_conclusion_state(git, repository, cleanup); });
let Ok(built) = build_index(git, repository, intent.new.as_str(), intent_paths(intent), intent.index.as_path(), intent.seq) else {
return false;
};
return lock.release_with(built.as_path()).is_ok() && cleaned;
}
pub fn land_batch(context: &LandContext, seq: u64, requests: &[CommitRequest]) -> Result<Vec<Outcome>, FailureCode> {
return land_batch_announcing(context, seq, requests, &|_| {});
}
pub fn land_batch_announcing(context: &LandContext, seq: u64, requests: &[CommitRequest], announce: &dyn Fn(Announce)) -> Result<Vec<Outcome>, FailureCode> {
return land_batch_timed(context, seq, requests, announce, &mut LandTiming::default());
}
pub fn land_batch_timed(
context: &LandContext,
seq: u64,
requests: &[CommitRequest],
announce: &dyn Fn(Announce),
timing: &mut LandTiming,
) -> Result<Vec<Outcome>, FailureCode> {
let first: &CommitRequest = requests.first().ok_or(FailureCode::Rejected)?;
if requests.iter().any(|request| {
return request.repository != first.repository || request.common_dir != first.common_dir || request.reference != first.reference;
}) {
return Err(FailureCode::Rejected);
}
let alone: bool = requests.iter().any(CommitRequest::lands_alone);
if alone && requests.len() != 1 {
return Err(FailureCode::Rejected);
}
let repository: &Path = first.repository.as_path();
let git: GitContext = GitContext { common_dir: Some(first.common_dir.clone()), ..context.git.clone() };
let scratch: String = format!("refs/worktree/cli-git-service/{seq}");
let mut outcomes: Vec<Outcome>;
let mut attempts_left: usize = LANDING_ATTEMPTS;
let unborn: bool = is_zero_object(first.base.as_str());
let waiting_since: Instant = Instant::now();
let taken = acquire_noting_holder(first.index.as_path(), seq, context.index_wait, announce, &mut timing.lock_holder);
timing.lock_wait = waiting_since.elapsed();
let mut lock: Option<IndexLock> = Some(taken.map_err(|failure| { return failure.code; })?);
loop {
timing.attempts += 1;
let old: String = match checked(&git, repository, &["rev-parse", "--verify", "--quiet", first.reference.as_str()], None) {
Ok(found) => found,
Err(_) if unborn => first.base.clone(),
Err(code) => return Err(code),
};
if alone && first.base != old {
return Ok(vec![Outcome::BranchMoved]);
}
if first.reference == "HEAD" && run(&git, repository, &["symbolic-ref", "--quiet", "HEAD"], None)?.succeeded() {
return Ok(vec![Outcome::BranchMoved]);
}
if first.reference != "HEAD" && !head_names(&git, repository, first.index.as_path(), first.common_dir.as_path(), first.reference.as_str())? {
return Ok(vec![Outcome::BranchMoved; requests.len()]);
}
let amended_parents: Vec<String> = if alone && !unborn {
let listing: String = checked(&git, repository, &["rev-list", "--parents", "--max-count=1", first.base.as_str()], None)?;
listing.split_whitespace().skip(1).map(str::to_string).collect()
} else {
Vec::new()
};
let mut changed_since: HashMap<&str, BTreeSet<String>> = HashMap::new();
let mut landing: Vec<(usize, &CommitRequest)> = Vec::new();
outcomes = vec![Outcome::RetryPrepare { base: old.clone() }; requests.len()];
for (index, request) in requests.iter().enumerate() {
if request.base != old && !changed_since.contains_key(request.base.as_str()) {
let listing: String = checked(&git, repository, &["diff-tree", "-r", "--name-only", "-z", request.base.as_str(), old.as_str()], None)?;
changed_since.insert(request.base.as_str(), listing.split('\0').filter(|name| { return !name.is_empty(); }).map(str::to_string).collect());
}
let conflicts: bool = request.base != old
&& request.changes.iter().any(|change| {
return changed_since.get(request.base.as_str()).is_some_and(|names| { return names.iter().any(|name| { return overlaps(change.path.as_str(), name.as_str()); }); });
});
let shadowed: bool = landing.iter().any(|(_, earlier)| {
let later_capture: bool = earlier.captured != 0 && request.captured > earlier.captured;
return !later_capture && request.changes.iter().any(|change| { return earlier.changes.iter().any(|member| { return overlaps(change.path.as_str(), member.path.as_str()); }); });
});
if !conflicts && !shadowed {
landing.push((index, request));
}
}
if landing.is_empty() {
return Ok(outcomes);
}
let batch: Vec<&CommitRequest> = landing.iter().map(|(_, request)| { return *request; }).collect();
if batch_content_missing(first.common_dir.as_path(), batch.as_slice()) {
return Err(FailureCode::Unavailable);
}
let objects_began: Instant = Instant::now();
let (commits, new): (Vec<String>, String) = if let Some(built) = first.commit.as_deref() {
let listing: GitOutput = run(&git, repository, &["rev-list", "--parents", "--max-count=1", built], None)?;
let text: String = String::from_utf8_lossy(listing.stdout.as_slice()).into_owned();
let mut words = text.split_whitespace();
let named_itself: bool = listing.succeeded() && words.next() == Some(built);
let parents: Vec<String> = words.map(str::to_string).collect();
let acceptable: bool = if first.amend {
parents == amended_parents
} else if unborn {
parents.is_empty()
} else {
parents.first() == Some(&first.base)
};
if !named_itself || !acceptable {
return Err(FailureCode::Rejected);
}
let connected: Vec<&str> = if unborn { vec!["rev-list", "--objects", "--quiet", built] } else { vec!["rev-list", "--objects", "--quiet", built, "--not", old.as_str()] };
if !run(&git, repository, connected.as_slice(), None)?.succeeded() {
return Err(FailureCode::Unavailable);
}
(vec![built.to_string()], built.to_string())
} else {
let marks: PathBuf = context.journal.join(format!("marks-{seq}"));
let marks_argument: String = format!("--export-marks={}", marks.display());
checked(&git, repository, &["fast-import", "--quiet", "--done", marks_argument.as_str()], Some(import_stream(scratch.as_str(), old.as_str(), &batch, amended_parents.as_slice())))?;
let marks_text: String = std::fs::read_to_string(&marks).map_err(|_| { return FailureCode::Unavailable; })?;
let _marks_removed = std::fs::remove_file(&marks);
let made: Vec<String> = commits_from_marks(marks_text.as_str(), batch.len()).ok_or(FailureCode::Unavailable)?;
let last: String = made.last().cloned().ok_or(FailureCode::Unavailable)?;
(made, last)
};
timing.objects += objects_began.elapsed();
reach("after-objects");
if let Some(seam) = &context.on_objects_written {
seam();
}
let derived: bool = first.commit.is_some();
let paths: Vec<String> = if derived {
Vec::new()
} else {
batch.iter().flat_map(|request| { return request.changes.iter().map(|change| { return change.path.clone(); }); }).collect()
};
let intent: Intent = Intent {
seq,
repository: first.repository.clone(),
common_dir: first.common_dir.clone(),
reference: first.reference.clone(),
old: old.clone(),
new: new.clone(),
ids: batch.iter().map(|request| { return request.id.clone(); }).collect(),
commits: commits.clone(),
paths,
derived,
cleanup: first.cleanup.clone(),
index: first.index.clone(),
git_dir: first.git_dir.clone(),
};
let journal_began: Instant = Instant::now();
let written = write_intent(context.journal.as_path(), &intent);
timing.journal += journal_began.elapsed();
written.map_err(|error| { return storage_failure(&error); })?;
reach("after-intent");
let removal: String = if first.commit.is_some() { String::new() } else { format!("delete {scratch}\n") };
let direct: &str = if first.reference == "HEAD" { "option no-deref\n" } else { "" };
let transaction: String = format!("start\n{direct}update {} {new} {old}\n{removal}prepare\ncommit\n", first.reference);
let ref_began: Instant = Instant::now();
let ran = run(&git, repository, &["update-ref", "--stdin"], Some(transaction.into_bytes()));
timing.ref_update += ref_began.elapsed();
let moved: GitOutput = ran?;
if !moved.succeeded() {
let _intent_removed = std::fs::remove_file(super::service_journal::batch_path(context.journal.as_path(), seq, OPEN_EXTENSION));
let _deleted = run(&git, repository, &["update-ref", "-d", scratch.as_str()], None);
attempts_left -= 1;
if attempts_left == 0 {
return Err(FailureCode::BranchKeepsChanging);
}
continue;
}
reach("after-ref");
let Some(held) = lock.take() else { return Err(FailureCode::Unavailable) };
let sync_began: Instant = Instant::now();
let synced: bool = follow_up(&git, repository, &intent, held);
timing.sync += sync_began.elapsed();
if synced {
reach("after-index");
let _marked = mark_done(context.journal.as_path(), seq);
}
for (slot, (index, request)) in landing.iter().enumerate() {
outcomes[*index] = Outcome::Landed { commit: commits[slot].clone() };
super::service_captures::record_landed(request.common_dir.as_path(), request.repository.as_path(), commits[slot].as_str(), request.captured);
}
return Ok(outcomes);
}
}
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct RecoveryReport {
pub seq: u64,
pub decision: Recovery,
}
pub fn recover(context: &LandContext) -> Vec<RecoveryReport> {
return recover_selected(context, &|_| { return true; }, true);
}
pub fn recover_instance(context: &LandContext, instance: &str) -> Vec<RecoveryReport> {
let ours = |intent: &Intent| -> bool { return instance_of(intent.git_dir.as_path()) == instance; };
return recover_selected(context, &ours, false);
}
fn recover_selected(context: &LandContext, selected: &dyn Fn(&Intent) -> bool, remove_unreadable: bool) -> Vec<RecoveryReport> {
let mut reports: Vec<RecoveryReport> = Vec::new();
for (path, parsed) in list_intents(context.journal.as_path(), OPEN_EXTENSION) {
let Some(intent) = parsed else {
if remove_unreadable {
let _removed = std::fs::remove_file(&path);
}
continue;
};
if !selected(&intent) {
continue;
}
let git: GitContext = GitContext { common_dir: Some(intent.common_dir.clone()), ..context.git.clone() };
let current: String = checked(&git, intent.repository.as_path(), &["rev-parse", "--verify", intent.reference.as_str()], None).unwrap_or_default();
let ancestor: bool = run(&git, intent.repository.as_path(), &["merge-base", "--is-ancestor", intent.new.as_str(), current.as_str()], None)
.is_ok_and(|output| { return output.succeeded(); });
let decision: Recovery = recovery_for(&intent, current.as_str(), ancestor);
match decision {
Recovery::Drop => {
remove_stale(intent.index.as_path(), intent.seq);
let _removed = std::fs::remove_file(&path);
}
Recovery::Finish => {
remove_stale(intent.index.as_path(), intent.seq);
if let Some(held) = try_acquire(intent.index.as_path(), intent.seq)
&& follow_up(&git, intent.repository.as_path(), &intent, held)
{
let _marked = mark_done(context.journal.as_path(), intent.seq);
}
}
}
reports.push(RecoveryReport { seq: intent.seq, decision });
}
return reports;
}
#[cfg(test)]
#[path = "service_land_tests.rs"]
mod tests;