use super::capture_invocation::{InvocationCapture, base_revision, capture_invocation_base, capture_invocation_layout};
use super::private_index_request::{CaptureIndexes, indexed_request};
use super::commit_conclusion::{events_with_changed_summary, events_with_summary};
use super::commit_convergence::{CommitConvergence, CommitConvergenceInput, converge_commit_policies};
use super::commit_facts::PrivateIndexFacts;
use super::commit_index::{
IndexSelection, initialize_commit_index, list_changed_index_paths, list_unmerged_index_paths, prepare_interactive_selection,
write_private_tree,
};
use super::commit_no_change::{NO_CHANGE_CODE, NO_CHANGE_CORE_ID, no_change_message};
use super::commit_staged_deletions::{STAGED_DELETION_CODE, STAGED_DELETION_CORE_ID, staged_deletion_message, staged_deletions_present_on_disk};
use super::commit_transaction::{
CommitInvocation, Selection, TransactionResult, TransactionStop, base_object, decide_selection, failed, private_checks, settled_passes, staged_at_base,
};
use super::commit_worktree_records::selected_worktree_records;
use super::conclusion_cleanup::{CONCLUSION_STATE_FILES, SEQUENCER_DIRECTORY};
use super::config_snapshot::ConfigSnapshot;
use super::lfs_pre_push::uses_lfs;
use super::policy_checks::ShippedChecks;
use super::policy_engine::{StageRequest, pass_exit_code};
use super::policy_events::PolicyEvent;
use super::policy_pass::{PassResult, run_policy_pass};
use super::private_index_stage::PrivateStage;
use super::private_storage::{create_private_directory, remove_tree, write_private_file};
use super::repository_facts::RepositoryFacts;
use super::service_land_follow::{IndexPaths, update_index};
use super::service_pruned::reach_service_phase;
use super::transaction_phase::Phase;
use super::service_protocol::{ALLOWED_MODES, Change, Cleanup, MAX_CHANGES, is_object_name, is_plain_path};
use super::merge_second_pass::Merged as MergedFile;
use super::service_replay::{MergeSite, Merged, ReplayConflict, Retry, already_committed_result, capture_stamp, first_landed, merge_captured, word_merge_notice};
use super::external_hooks::warn_external_hooks;
use super::traditional_hook_warning::warn_traditional_hooks;
use super::transaction_git::{GitContext, run_git_checked};
use super::transaction_journal::{AddedPath, Base, Conclusion, RefFormat, SymbolicHead, TransactionMode};
use super::worktree_completion::install_added_worktree_files;
use std::ffi::OsString;
use std::path::{Path, PathBuf};
pub struct Scratch(pub PathBuf);
impl Drop for Scratch {
fn drop(&mut self) {
let _removed = remove_tree(self.0.as_path());
}
}
pub enum Prepared {
Ended(TransactionResult),
Ready(Box<Ready>),
Conflict(Box<ReplayConflict>),
}
pub struct NativeInputs {
pub capture: InvocationCapture,
pub arguments: Vec<OsString>,
pub pathspecs: Vec<String>,
pub mode: TransactionMode,
pub staged_all: bool,
pub selected_privately: bool,
pub commit_index: PathBuf,
}
pub struct Ready {
pub repository: PathBuf,
pub common_dir: PathBuf,
pub reference: String,
pub base: String,
pub changes: Option<Vec<Change>>,
pub events: Vec<PolicyEvent>,
pub uses_lfs: bool,
pub scratch: Scratch,
pub needs_native: bool,
pub inputs: NativeInputs,
pub worktree_records: Vec<AddedPath>,
pub cleanup: Option<Cleanup>,
pub interactive: bool,
pub fixed_parents: bool,
pub captured_at: u64,
pub committed_conflicted: Vec<Vec<u8>>,
pub leaves_open: Option<Conclusion>,
}
pub fn zero_object(empty_tree: &str) -> String {
return "0".repeat(empty_tree.len());
}
pub fn changes_of(context: &GitContext, cwd: &Path, indexes: &CaptureIndexes, base: &str) -> Result<Option<Vec<Change>>, TransactionStop> {
let arguments: Vec<String> = ["diff-index", "--cached", "-r", "--raw", "-z", "--no-renames", "--no-abbrev", base].map(String::from).to_vec();
let output = run_git_checked(
context,
&indexed_request(cwd, &arguments, Some(indexes.commit_index.as_path()), Some(indexes.object_directory.as_path())),
)?;
let text: String = match String::from_utf8(output.stdout) {
Ok(text) => text,
Err(_) => return Ok(None),
};
let mut fields = text.split('\0').filter(|field| { return !field.is_empty(); });
let mut changes: Vec<Change> = Vec::new();
while let Some(header) = fields.next() {
let Some(path) = fields.next() else { return Ok(None) };
let parts: Vec<&str> = header.trim_start_matches(':').split(' ').collect();
let [_, new_mode, _, new_name, status] = parts.as_slice() else { return Ok(None) };
let deletion: bool = status.starts_with('D');
let mode: u32 = if deletion { ALLOWED_MODES[0] } else { u32::from_str_radix(new_mode, 8).unwrap_or(0) };
if !is_plain_path(path) || !ALLOWED_MODES.contains(&mode) || (!deletion && !is_object_name(new_name)) {
return Ok(None);
}
changes.push(Change { path: path.to_string(), mode, blob: if deletion { None } else { Some((*new_name).to_string()) } });
if changes.len() > MAX_CHANGES {
return Ok(None);
}
}
return Ok(Some(changes));
}
pub fn config_needs_native(snapshot: Option<&ConfigSnapshot>) -> bool {
const KEYS: [&str; 7] = ["commit.template", "commit.cleanup", "i18n.commitencoding", "core.commentchar", "core.commentstring", "commit.signoff", "commit.verbose"];
let Some(found) = snapshot else { return true };
return found.entries().iter().any(|entry| {
let value: String = entry.value.as_deref().map(|bytes| { return String::from_utf8_lossy(bytes).to_lowercase(); }).unwrap_or_default();
let signs: bool = entry.key == "commit.gpgsign" && !["false", "no", "off", "0"].contains(&value.as_str());
return signs || KEYS.contains(&entry.key.as_str()) || entry.key.starts_with("trailer.");
});
}
fn pathspec_file_for(scratch: &Path, cwd: &Path, source: Option<&str>, standard_input: Option<&[u8]>) -> std::io::Result<Option<PathBuf>> {
let Some(name) = source else { return Ok(None) };
if name != "-" {
let path: PathBuf = PathBuf::from(name);
return Ok(Some(if path.is_absolute() { path } else { cwd.join(path) }));
}
let snapshot: PathBuf = scratch.join(super::commit_index::PATHSPEC_INPUT_NAME);
write_private_file(snapshot.as_path(), standard_input.unwrap_or_default())?;
return Ok(Some(snapshot));
}
pub struct PrepareInputs<'a> {
pub scratch_name: &'a str,
pub allow_empty: bool,
pub standard_input: Option<&'a [u8]>,
pub first: bool,
pub replay: Option<Retry<'a>>,
}
pub fn prepare<F: RepositoryFacts>(
invocation: &CommitInvocation<'_>,
checks: &mut ShippedChecks<F>,
request: &StageRequest,
inputs: &PrepareInputs<'_>,
) -> Result<Prepared, TransactionStop> {
let context: &GitContext = invocation.context;
let cwd: &Path = invocation.cwd;
let region = invocation.region;
let layout = capture_invocation_layout(context, cwd, region.amend)?;
if inputs.first {
warn_traditional_hooks(layout.config_snapshot.as_ref(), &mut std::io::stderr());
warn_external_hooks(layout.config_snapshot.as_ref(), &mut std::io::stderr());
}
let names_paths: bool = !region.pathspecs.is_empty() || region.pathspec_from_file.is_some();
let unmerged_before: Vec<Vec<u8>> = if region.all || (matches!(layout.conclusion, Conclusion::Merge | Conclusion::CherryPick) && names_paths) {
list_unmerged_index_paths(context, cwd, layout.real_index_path.as_path())?
} else {
Vec::new()
};
let selection: Selection = decide_selection(region, layout.conclusion);
let reference: String = match &layout.symbolic_head {
SymbolicHead::Branch(name) => name.clone(),
SymbolicHead::Detached => String::from("HEAD"),
};
let detached: bool = layout.symbolic_head == SymbolicHead::Detached;
let named: bool = selection.mode == TransactionMode::ExplicitPath;
let capture: InvocationCapture = capture_invocation_base(context, cwd, layout)?;
let unborn: bool = matches!(capture.base, Base::Unborn);
let config_native: bool = config_needs_native(capture.layout.config_snapshot.as_ref());
let base: String = base_revision(&capture);
let announced_base: String = match &capture.base {
Base::Commit(oid) => oid.clone(),
Base::Unborn => zero_object(capture.layout.empty_tree_oid.as_str()),
};
let region_arguments: &[OsString] = &invocation.arguments[invocation.subcommand_index + 1..];
let pathspecs: Vec<OsString> = region.pathspecs.iter().map(|at| { return region_arguments[*at].clone(); }).collect();
let retry: Option<&Retry<'_>> = inputs.replay.as_ref();
if named && retry.is_none() {
let present: Vec<Vec<u8>> = staged_deletions_present_on_disk(
context,
cwd,
capture.layout.repository_root.as_path(),
capture.layout.real_index_path.as_path(),
base.as_str(),
pathspecs.as_slice(),
)?;
if !present.is_empty() {
return Ok(Prepared::Ended(TransactionResult {
events: vec![PolicyEvent::CoreFinding {
core_id: STAGED_DELETION_CORE_ID,
code: STAGED_DELETION_CODE,
message: staged_deletion_message(present.as_slice()),
}],
exit_code: 1,
landed_oid: None,
uses_lfs: false,
}));
}
}
let amends: bool = region.amend;
let scratch: Scratch = Scratch(capture.layout.git_dir.join(inputs.scratch_name));
create_private_directory(scratch.0.as_path()).map_err(|error| { return failed(format!("preparing the commit failed: {error}")); })?;
let indexes: CaptureIndexes = CaptureIndexes {
captured_index: scratch.0.join("captured.index"),
commit_index: scratch.0.join("commit.index"),
object_directory: capture.layout.object_directory.clone(),
};
let pathspec_source: Option<String> = region.pathspec_from_file.map(|value| {
return String::from_utf8_lossy(super::command_options_query::value_bytes(region_arguments, value)).into_owned();
});
let pathspec_file: Option<PathBuf> = pathspec_file_for(scratch.0.as_path(), cwd, pathspec_source.as_deref(), inputs.standard_input)
.map_err(|error| { return failed(format!("reading the pathspec file failed: {error}")); })?;
let index_selection: IndexSelection<'_> = IndexSelection {
mode: selection.mode,
pathspecs: pathspecs.as_slice(),
pathspec_file: pathspec_file.as_deref(),
pathspec_file_nul: region.pathspec_file_nul,
stage_into_index: region.include,
stage_tracked_changes: selection.staged_all,
base_revision: base.as_str(),
};
let mut word_merge_events: Option<PolicyEvent> = None;
if let Some(again) = retry {
let site: MergeSite<'_> = MergeSite {
context,
cwd,
common_dir: capture.layout.common_dir.as_path(),
object_directory: indexes.object_directory.as_path(),
scratch: scratch.0.as_path(),
};
let (tree, combined): (String, Vec<MergedFile>) = match merge_captured(&site, again.captured, base.as_str(), again.attempt)? {
Merged::Conflict(paths) => {
let landed = first_landed(context, cwd, again.captured.base.as_str(), base.as_str(), paths.as_slice())?;
return Ok(Prepared::Conflict(Box::new(ReplayConflict { paths, landed, git_dir: capture.layout.git_dir.clone() })));
}
Merged::Tree(tree) => (tree, Vec::new()),
Merged::Combined { tree, files } => (tree, files),
};
run_git_checked(
context,
&indexed_request(cwd, &["read-tree", tree.as_str()], Some(indexes.commit_index.as_path()), Some(indexes.object_directory.as_path())),
)?;
word_merge_events = word_merge_notice(combined.as_slice());
} else {
initialize_commit_index(context, cwd, capture.layout.real_index_path.as_path(), &indexes, &index_selection)
.map_err(|error| { return failed(error.0); })?;
}
let captured_at: u64 = retry.map_or_else(capture_stamp, |again| { return again.captured.captured; });
reach_service_phase(Phase::ServiceStaged)?;
if (region.interactive || region.patch) && retry.is_none() {
prepare_interactive_selection(context, cwd, indexes.commit_index.as_path(), indexes.object_directory.as_path(), region.patch, &index_selection)?;
}
let interactive: bool = region.interactive || region.patch;
let reftable: bool = capture.layout.ref_format == RefFormat::Reftable;
let state_present: bool = selection.concludes_sequencer || CONCLUSION_STATE_FILES.iter().chain([SEQUENCER_DIRECTORY].iter()).any(|entry| { return capture.layout.git_dir.join(entry).exists(); });
let cleanup: Option<Cleanup> = state_present.then(|| {
return Cleanup { git_dir: capture.layout.git_dir.clone(), scratch: scratch.0.clone(), reftable };
});
let selected_privately: bool = selection.read_only;
let make_inputs = |arguments: Vec<OsString>, captured: InvocationCapture| -> NativeInputs {
return NativeInputs {
arguments,
pathspecs: pathspecs.iter().map(|token| { return token.to_string_lossy().into_owned(); }).collect(),
mode: selection.mode,
staged_all: selection.staged_all,
selected_privately,
commit_index: indexes.commit_index.clone(),
capture: captured,
};
};
let fixed_parents: bool = selection.concludes_sequencer || unborn;
let by_git = |taken: InvocationCapture, events: Vec<PolicyEvent>, changes: Option<Vec<Change>>, records: Vec<AddedPath>, arguments: Vec<OsString>, scratch_dir: Scratch| -> Box<Ready> {
return Box::new(Ready {
repository: taken.layout.repository_root.clone(),
common_dir: taken.layout.common_dir.clone(),
reference: reference.clone(),
base: announced_base.clone(),
changes,
events,
uses_lfs: taken.layout.config_snapshot.as_ref().is_none_or(uses_lfs),
scratch: scratch_dir,
needs_native: true,
inputs: make_inputs(arguments, taken),
worktree_records: records,
cleanup: cleanup.clone(),
interactive,
fixed_parents,
captured_at,
committed_conflicted: Vec::new(),
leaves_open: None,
});
};
let unmerged_files: Vec<Vec<u8>> = list_unmerged_index_paths(context, cwd, indexes.commit_index.as_path())?;
if !unmerged_files.is_empty() {
let mut staging: Vec<OsString> = vec![OsString::from("add"), OsString::from("--all"), OsString::from("--")];
for path in &unmerged_files {
let mut spec: Vec<u8> = b":(top,literal)".to_vec();
spec.extend_from_slice(path.as_slice());
staging.push(<OsString as std::os::unix::ffi::OsStringExt>::from_vec(spec));
}
run_git_checked(context, &indexed_request(cwd, staging.as_slice(), Some(indexes.commit_index.as_path()), Some(indexes.object_directory.as_path())))?;
}
let candidate_paths: Vec<Vec<u8>> =
list_changed_index_paths(context, cwd, indexes.commit_index.as_path(), base.as_str(), indexes.object_directory.as_path())?;
if candidate_paths.is_empty() && !inputs.allow_empty && !amends {
if retry.is_some() {
return Ok(Prepared::Ended(already_committed_result(reference.trim_start_matches("refs/heads/"))));
}
return Ok(Prepared::Ready(by_git(capture, Vec::new(), None, Vec::new(), invocation.arguments.to_vec(), scratch)));
}
let mut private: ShippedChecks<PrivateIndexFacts<&mut F>> = private_checks(
checks,
indexes.commit_index.as_path(),
indexes.object_directory.as_path(),
staged_at_base(base_object(&capture)?, candidate_paths.as_slice()),
);
let (pass, changed_passes, changed_paths): (PassResult, u64, Vec<Vec<u8>>) = if selection.read_only {
private.can_apply_patches = false;
(run_policy_pass(request, &mut private), 0, Vec::new())
} else {
let outcome: CommitConvergence = converge_commit_policies(CommitConvergenceInput {
request,
checks: &mut private,
stage: PrivateStage { context, cwd, index: indexes.commit_index.as_path(), object_directory: Some(indexes.object_directory.as_path()) },
});
let passes: u64 = settled_passes(&outcome.convergence);
(outcome.pass, passes, outcome.changed_paths)
};
let code: i32 = pass_exit_code(pass.events.as_slice(), pass.end);
if code != 0 {
return Ok(Prepared::Ended(TransactionResult { events: pass.events, exit_code: code, landed_oid: None, uses_lfs: false }));
}
let repository_root: &Path = capture.layout.repository_root.as_path();
let install = private.content.install_changes();
let records: Vec<AddedPath> = selected_worktree_records(context, cwd, repository_root, indexes.commit_index.as_path(), install.as_slice())?;
let eligible: bool = !install.is_empty() && !region.allow_empty && !amends && !selection.concludes_sequencer;
if eligible && !unborn {
let intended: String = write_private_tree(context, cwd, indexes.commit_index.as_path(), indexes.object_directory.as_path())?;
let mut tree_request = indexed_request(cwd, &["rev-parse", "--verify", format!("{base}^{{tree}}").as_str()], None, None);
tree_request.without_prefix = true;
let base_tree: String = String::from_utf8_lossy(run_git_checked(context, &tree_request)?.stdout.as_slice()).trim().to_string();
if base_tree == intended {
return normalized(invocation, &capture, base.as_str(), &candidate_paths, records.as_slice(), &(pass.events, changed_passes, changed_paths));
}
}
let mut events: Vec<PolicyEvent> = events_with_changed_summary(pass.events.clone(), changed_passes, changed_paths.as_slice());
events.extend(word_merge_events);
let changes: Option<Vec<Change>> = if config_native || unborn || detached || state_present { None } else { changes_of(context, cwd, &indexes, base.as_str())? };
let forced: bool = config_native || unborn || detached || state_present || changes.is_none();
let leaves_open: Option<Conclusion> = Some(capture.layout.conclusion).filter(|kind| { return named && matches!(kind, Conclusion::Merge | Conclusion::CherryPick); });
let mut ready: Box<Ready> = by_git(capture, events, changes, records, pass.arguments.clone(), scratch);
ready.needs_native = forced;
ready.committed_conflicted = unmerged_before.into_iter().filter(|path| { return candidate_paths.contains(path); }).collect();
ready.committed_conflicted.extend(unmerged_files);
ready.leaves_open = leaves_open;
return Ok(Prepared::Ready(ready));
}
fn normalized(
invocation: &CommitInvocation<'_>,
capture: &InvocationCapture,
base: &str,
committed: &[Vec<u8>],
records: &[AddedPath],
settled: &(Vec<PolicyEvent>, u64, Vec<Vec<u8>>),
) -> Result<Prepared, TransactionStop> {
let (events, passes, changed_paths) = settled;
update_index(invocation.context, capture.layout.repository_root.as_path(), capture.layout.real_index_path.as_path(), base, IndexPaths::Named(committed))
.map_err(|code| { return failed(format!("the index could not be reconciled with the corrected files: {}", code.word())); })?;
let completion = install_added_worktree_files(
invocation.context,
invocation.cwd,
capture.layout.repository_root.as_path(),
records,
Some(capture.layout.object_directory.as_path()),
)
.map_err(|error| { return TransactionStop::Message(error.0); })?;
let mut summary: Vec<PolicyEvent> = events_with_summary(events.clone(), *passes, changed_paths.as_slice());
summary.push(PolicyEvent::CoreFinding {
core_id: NO_CHANGE_CORE_ID,
code: NO_CHANGE_CODE,
message: no_change_message(completion.conflicted.as_slice()),
});
return Ok(Prepared::Ended(TransactionResult { events: summary, exit_code: 1, landed_oid: None, uses_lfs: false }));
}