amont_runtime/git.rs
1//! Thin wrappers over the `git` calls the hooks make.
2
3use std::process::{Command, Stdio};
4
5/// Run `cmd`, retrying the transient SPAWN failures a loaded machine
6/// produces: EINTR, EAGAIN (fork pressure), ETXTBSY (another thread's
7/// fork-to-exec window still holding a write descriptor on the executable).
8/// A NON-ZERO EXIT IS NEVER RETRIED — that is git answering; this covers
9/// only "git could not be asked".
10///
11/// The failure this ends: `gate_stamp`'s tests — and, invisibly, real
12/// hooks on a loaded machine — watched a single failed fork turn
13/// `bind_to_head` into "nothing to stamp". The hooks' fail-open reading of
14/// `None` is right for a git that is genuinely absent; three attempts over
15/// ~130ms is the difference between that and a scheduler hiccup.
16fn retrying<T>(mut attempt: impl FnMut() -> std::io::Result<T>) -> std::io::Result<T> {
17 let mut delay = std::time::Duration::from_millis(10);
18 for tries_left in [2u8, 1, 0] {
19 match attempt() {
20 Err(e) if tries_left > 0 && transient(&e) => {
21 std::thread::sleep(delay);
22 delay *= 3;
23 }
24 other => return other,
25 }
26 }
27 unreachable!("the zero-tries arm returns")
28}
29
30/// The retryable kinds, matched on raw OS codes because the precise
31/// `io::ErrorKind` variants (`ExecutableFileBusy`, `ResourceBusy`) are not
32/// stable at this crate's MSRV: EINTR(4), EAGAIN(11 linux / 35 mac),
33/// ETXTBSY(26).
34fn transient(e: &std::io::Error) -> bool {
35 if matches!(
36 e.kind(),
37 std::io::ErrorKind::Interrupted | std::io::ErrorKind::WouldBlock
38 ) {
39 return true;
40 }
41 matches!(e.raw_os_error(), Some(4 | 11 | 26 | 35))
42}
43
44/// stdout of a git command, trimmed. `None` when git itself failed — which the
45/// hooks treat as "cannot tell, do not block", never as "empty".
46pub fn stdout(args: &[&str]) -> Option<String> {
47 let mut cmd = Command::new("git");
48 cmd.args(args).stderr(Stdio::null());
49 let out = retrying(|| cmd.output()).ok()?;
50 if !out.status.success() {
51 return None;
52 }
53 Some(String::from_utf8_lossy(&out.stdout).trim().to_string())
54}
55
56/// The same, run inside `dir`.
57///
58/// The dashboard asks about repositories it is not standing in, and must get
59/// the answer git would give THERE — config is per-repository, so asking from
60/// the wrong directory returns the wrong severity.
61pub fn stdout_in(dir: &std::path::Path, args: &[&str]) -> Option<String> {
62 let mut cmd = Command::new("git");
63 cmd.arg("-C").arg(dir).args(args).stderr(Stdio::null());
64 let out = retrying(|| cmd.output()).ok()?;
65 if !out.status.success() {
66 return None;
67 }
68 Some(String::from_utf8_lossy(&out.stdout).trim().to_string())
69}
70
71/// [`succeeds`] for a repository this process is not standing in — the shape
72/// the fleet needs to UNDO something (delete a ref it wrote) rather than ask
73/// about it. Output discarded; `false` covers "git could not run" too.
74pub fn succeeds_in(dir: &std::path::Path, args: &[&str]) -> bool {
75 let mut cmd = Command::new("git");
76 cmd.arg("-C")
77 .arg(dir)
78 .args(args)
79 .stdin(Stdio::null())
80 .stdout(Stdio::null())
81 .stderr(Stdio::null());
82 retrying(|| cmd.status())
83 .map(|s| s.success())
84 .unwrap_or(false)
85}
86
87/// stdout of a git command that itself reads a list from stdin — `diff-tree
88/// --stdin`, fed a list of commits, is the only caller today. Lossy but
89/// untrimmed: every line is a path, and the caller trims those itself.
90pub fn stdout_piped(args: &[&str], stdin: &str) -> Option<String> {
91 use std::io::Write;
92 let mut cmd = Command::new("git");
93 cmd.args(args)
94 .stdin(Stdio::piped())
95 .stdout(Stdio::piped())
96 .stderr(Stdio::null());
97 let mut child = retrying(|| cmd.spawn()).ok()?;
98 child.stdin.take()?.write_all(stdin.as_bytes()).ok()?;
99 let out = child.wait_with_output().ok()?;
100 out.status
101 .success()
102 .then(|| String::from_utf8_lossy(&out.stdout).into_owned())
103}
104
105/// As `stdout_piped`, but returning the RAW bytes.
106///
107/// Needed by the one caller that must both feed git a list on stdin and read a
108/// `-z` path list back — `diff-tree --stdin -z`. `stdout_paths` cannot serve it
109/// (no stdin) and `stdout_piped` cannot either (lossy `String`, and the NUL
110/// separators are the whole point).
111pub fn stdout_piped_raw(args: &[&str], stdin: &str) -> Option<Vec<u8>> {
112 use std::io::Write;
113 let mut cmd = Command::new("git");
114 cmd.args(args)
115 .stdin(Stdio::piped())
116 .stdout(Stdio::piped())
117 .stderr(Stdio::null());
118 let mut child = retrying(|| cmd.spawn()).ok()?;
119 child.stdin.take()?.write_all(stdin.as_bytes()).ok()?;
120 let out = child.wait_with_output().ok()?;
121 out.status.success().then_some(out.stdout)
122}
123
124/// As `stdout_piped`, but inside `dir` and taking raw bytes.
125///
126/// `-C dir` matters for `hash-object`: a repository configured for SHA-256
127/// computes a different id than the default, so the identity has to be asked
128/// of THAT repository. Bytes rather than `&str` because the input is a file we
129/// have already read and must not re-encode.
130pub fn stdout_piped_in(dir: &std::path::Path, args: &[&str], stdin: &[u8]) -> Option<String> {
131 use std::io::Write;
132 let mut cmd = Command::new("git");
133 cmd.arg("-C")
134 .arg(dir)
135 .args(args)
136 .stdin(Stdio::piped())
137 .stdout(Stdio::piped())
138 .stderr(Stdio::null());
139 let mut child = retrying(|| cmd.spawn()).ok()?;
140 child.stdin.take()?.write_all(stdin).ok()?;
141 let out = child.wait_with_output().ok()?;
142 out.status
143 .success()
144 .then(|| String::from_utf8_lossy(&out.stdout).trim().to_string())
145}
146
147/// Raw stdout, untrimmed and not lossy — for a patch, where a trailing newline
148/// and any byte in a binary hunk are load-bearing.
149pub fn stdout_raw(args: &[&str]) -> Option<Vec<u8>> {
150 let mut cmd = Command::new("git");
151 cmd.args(args).stderr(Stdio::null());
152 let out = retrying(|| cmd.output()).ok()?;
153 out.status.success().then_some(out.stdout)
154}
155
156/// Everything a git command said: its exit code, its stdout and its stderr.
157pub struct Output {
158 pub code: i32,
159 pub stdout: String,
160 pub stderr: String,
161}
162
163/// A git command's full result, for the caller that must tell one kind of
164/// failure from another.
165///
166/// [`stdout`] collapses every non-zero exit to `None` and discards stderr,
167/// which is the right shape for "cannot tell, do not block". It is the wrong
168/// shape for reading configuration: `git config --get` exits **1** for a key
169/// nobody set and **128** for a key set to something git itself refuses to
170/// parse, and those two must not become the same answer — one is a default,
171/// the other is a mistake somebody needs to be told about. See `config`.
172pub fn output(args: &[&str]) -> Option<Output> {
173 let mut cmd = Command::new("git");
174 cmd.args(args).stdin(Stdio::null());
175 let out = retrying(|| cmd.output()).ok()?;
176 Some(Output {
177 // A process killed by a signal has no code. Treat that as "git did not
178 // answer" rather than inventing one; the caller falls back.
179 code: out.status.code()?,
180 stdout: String::from_utf8_lossy(&out.stdout).trim().to_string(),
181 stderr: String::from_utf8_lossy(&out.stderr).trim().to_string(),
182 })
183}
184
185/// How a bounded network probe ended. Exit codes stay visible because the
186/// callers need to keep git's answers apart: `ls-remote --exit-code` exits
187/// **2** for "connected, no such ref" and **128** for "could not connect",
188/// and reading those as one boolean is how offline got reported as
189/// "upstream deleted".
190pub enum Probe {
191 /// Ran to completion with this exit code.
192 Exit(i32),
193 /// Killed at the deadline; carries the budget it exceeded, in seconds.
194 TimedOut(u64),
195 /// Could not spawn, or died to a signal — "git did not answer".
196 Failed,
197}
198
199/// A git command that TALKS TO THE NETWORK, killed at `budget_secs`.
200///
201/// Every other runner in this module waits forever, which is correct for
202/// local plumbing — a `rev-parse` that hangs means the machine is already
203/// lost. A network verb hanging is Tuesday: captive portal, VPN split
204/// brain, a remote that accepts the TCP connect and then says nothing.
205/// Unbounded, that held the push hostage inside the index hold with no
206/// deadline anywhere; the learned response is `--no-verify`, permanently.
207/// `budget_secs == 0` means no deadline (the same opt-out `amont.timeout`
208/// honours). Output is discarded — network callers decide on exit codes.
209pub fn probe(args: &[&str], budget_secs: u64) -> Probe {
210 let mut cmd = Command::new("git");
211 cmd.args(args)
212 .stdin(Stdio::null())
213 .stdout(Stdio::null())
214 .stderr(Stdio::null());
215 if budget_secs == 0 {
216 return match retrying(|| cmd.status()) {
217 Ok(s) => s.code().map(Probe::Exit).unwrap_or(Probe::Failed),
218 Err(_) => Probe::Failed,
219 };
220 }
221 let Ok(mut child) = retrying(|| cmd.spawn()) else {
222 return Probe::Failed;
223 };
224 let deadline = std::time::Instant::now() + std::time::Duration::from_secs(budget_secs);
225 loop {
226 match child.try_wait() {
227 Ok(Some(s)) => return s.code().map(Probe::Exit).unwrap_or(Probe::Failed),
228 Ok(None) => {}
229 Err(_) => return Probe::Failed,
230 }
231 if std::time::Instant::now() >= deadline {
232 let _ = child.kill();
233 let _ = child.wait();
234 return Probe::TimedOut(budget_secs);
235 }
236 std::thread::sleep(std::time::Duration::from_millis(25));
237 }
238}
239
240/// True when the command exits 0. Output discarded.
241pub fn succeeds(args: &[&str]) -> bool {
242 let mut cmd = Command::new("git");
243 cmd.args(args)
244 .stdin(Stdio::null())
245 .stdout(Stdio::null())
246 .stderr(Stdio::null());
247 retrying(|| cmd.status())
248 .map(|s| s.success())
249 .unwrap_or(false)
250}
251
252/// A path list from `diff --name-only`, `diff-tree --name-only` or
253/// `ls-files` — commands whose output is meant to be split into individual
254/// paths, never just read as one blob.
255///
256/// By default git QUOTES any "unusual" byte in a path, non-ASCII included:
257/// `é.json` prints as `"\303\251.json"`. Reading that line as a literal path
258/// looks up a file that does not exist — the caller then treats real,
259/// unstaged content as absent, which is how `StagedOnly` used to lose it.
260/// `-z` disables quoting entirely and NUL-terminates each entry instead, so
261/// there is no escaping left to get wrong. Inserted right after the
262/// subcommand (`args[0]`), which is always a valid position for it on every
263/// command this is used for.
264pub fn stdout_paths(args: &[&str]) -> Option<Vec<String>> {
265 let (first, rest) = args.split_first()?;
266 let mut argv = Vec::with_capacity(args.len() + 1);
267 argv.push(*first);
268 argv.push("-z");
269 argv.extend_from_slice(rest);
270 stdout_raw(&argv).map(|raw| split_nul_paths(&raw))
271}
272
273/// The parsing half of [`stdout_paths`], split out so it can be tested on
274/// literal bytes rather than a real git process — including the byte
275/// sequence a QUOTED path would have produced under the old line-splitting
276/// approach, to prove `-z` output is never reinterpreted that way.
277pub(crate) fn split_nul_paths(raw: &[u8]) -> Vec<String> {
278 raw.split(|&b| b == 0)
279 .filter(|s| !s.is_empty())
280 .map(|s| String::from_utf8_lossy(s).into_owned())
281 .collect()
282}
283
284#[cfg(test)]
285mod retry_tests {
286 use super::*;
287
288 /// The classifier: scheduler hiccups retry, real answers do not.
289 #[test]
290 fn transient_covers_the_fork_pressure_kinds_and_nothing_else() {
291 for code in [4, 11, 26, 35] {
292 assert!(
293 transient(&std::io::Error::from_raw_os_error(code)),
294 "raw {code} is a loaded-machine hiccup"
295 );
296 }
297 assert!(transient(&std::io::Error::from(
298 std::io::ErrorKind::Interrupted
299 )));
300 assert!(!transient(&std::io::Error::from(
301 std::io::ErrorKind::NotFound
302 )));
303 assert!(!transient(&std::io::Error::from_raw_os_error(13))); // EACCES
304 }
305
306 /// Three attempts, then the error is the caller's: a git that is
307 /// genuinely absent must not cost more than ~130ms of patience.
308 #[test]
309 fn retrying_gives_up_after_three_transient_failures() {
310 let mut calls = 0;
311 let r: std::io::Result<()> = retrying(|| {
312 calls += 1;
313 Err(std::io::Error::from_raw_os_error(11))
314 });
315 assert!(r.is_err());
316 assert_eq!(calls, 3);
317 }
318
319 /// A non-transient error returns immediately — a missing git is an
320 /// answer, not a hiccup.
321 #[test]
322 fn a_hard_error_is_not_retried() {
323 let mut calls = 0;
324 let r: std::io::Result<()> = retrying(|| {
325 calls += 1;
326 Err(std::io::Error::from(std::io::ErrorKind::NotFound))
327 });
328 assert!(r.is_err());
329 assert_eq!(calls, 1);
330 }
331
332 /// A success after a hiccup is a success.
333 #[test]
334 fn one_hiccup_then_an_answer_is_an_answer() {
335 let mut calls = 0;
336 let r = retrying(|| {
337 calls += 1;
338 if calls == 1 {
339 Err(std::io::Error::from_raw_os_error(4))
340 } else {
341 Ok(42)
342 }
343 });
344 assert_eq!(r.unwrap(), 42);
345 assert_eq!(calls, 2);
346 }
347}
348
349#[cfg(test)]
350mod tests {
351 use super::*;
352
353 #[test]
354 fn splits_on_nul_and_drops_the_trailing_empty_segment() {
355 assert_eq!(
356 split_nul_paths(b"src/main.rs\0Cargo.toml\0"),
357 vec!["src/main.rs", "Cargo.toml"]
358 );
359 }
360
361 #[test]
362 fn empty_input_is_no_paths() {
363 assert_eq!(split_nul_paths(b""), Vec::<String>::new());
364 }
365
366 /// The exact bug this exists to prevent: under `--name-only` without
367 /// `-z`, git would have printed `é.json` as the quoted, LINE-oriented
368 /// text `"\303\251.json"` — literal backslashes, digits and quotes, nine
369 /// bytes standing in for the original two-byte UTF-8 sequence. `-z`
370 /// output carries the real UTF-8 bytes of the path with no such
371 /// reinterpretation, so splitting on NUL must hand them back unchanged.
372 #[test]
373 fn a_non_ascii_path_is_not_reinterpreted_as_its_quoted_form() {
374 let mut raw = "é.json".as_bytes().to_vec();
375 raw.push(0);
376 let got = split_nul_paths(&raw);
377 assert_eq!(got, vec!["é.json".to_string()]);
378 assert_ne!(got[0], "\"\\303\\251.json\"", "must not be the quoted form");
379 }
380}