mirror of
https://github.com/openai/codex.git
synced 2026-11-20 07:06:24 +00:00
Add managed worktree creation (#42196)
## What changed - Add `WorktreeManager::create` to create detached, Desktop-compatible worktrees from `HEAD` or an explicit base while preserving the source working-directory path. - Isolate worktree Git operations from inherited repository selectors, hooks, filesystem monitors, and configured content filters. - Validate the destination working directory and roll back incomplete worktrees and empty allocation buckets on failure. ## Testing - Cover layout, base selection, annotated tags, nested working directories, Git environment isolation, filter suppression, source checkout preservation, unsafe symlinks, and creation rollback. GitOrigin-RevId: bf172c3ff4268dab603d00a1d547485fcd0de368
This commit is contained in:
1 parent
5a0419edb5
commit
798833fe97
9 files changed
+856
-10
No files matched your search
@@ -1,35 +1,76 @@
|
||||
//! Executes Git metadata queries and decodes native filesystem paths.
|
||||
//! Runs isolated Git commands and decodes native filesystem paths.
|
||||
//!
|
||||
//! Commands remove inherited repository selectors and per-command Git config,
|
||||
//! select the repository from the supplied working directory, and disable hooks
|
||||
//! and filesystem monitoring.
|
||||
//!
|
||||
//! Filesystem monitoring is disabled uniformly, including Git's built-in daemon,
|
||||
//! rather than probing support. These command-local overrides avoid running
|
||||
//! repository-configured helpers without changing persistent Git settings.
|
||||
//!
|
||||
//! Working-tree operations also disable configured clean, smudge, and process filters.
|
||||
|
||||
use std::collections::BTreeSet;
|
||||
use std::ffi::OsStr;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
use std::process::Output;
|
||||
|
||||
use anyhow::Context;
|
||||
use anyhow::Result;
|
||||
use anyhow::bail;
|
||||
use codex_git_utils::SAFE_BARE_REPOSITORY_CONFIG;
|
||||
use codex_git_utils::git_config_override_env;
|
||||
use codex_protocol::shell_environment::scrub_non_inheritable_env_vars;
|
||||
|
||||
const DISABLED_HOOKS_PATH: &str = if cfg!(windows) { "NUL" } else { "/dev/null" };
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
pub(crate) enum GitOperation {
|
||||
Metadata,
|
||||
WorkingTree,
|
||||
}
|
||||
|
||||
pub(crate) fn git_output(
|
||||
cwd: &Path,
|
||||
operation: GitOperation,
|
||||
args: impl IntoIterator<Item = impl AsRef<OsStr>>,
|
||||
) -> Result<Output> {
|
||||
let mut command = base_git_command(cwd);
|
||||
if matches!(operation, GitOperation::WorkingTree) {
|
||||
command.envs(git_config_override_env(
|
||||
configured_filters(cwd)?.into_iter().flat_map(|filter| {
|
||||
[
|
||||
(format!("filter.{filter}.process"), String::new()),
|
||||
(format!("filter.{filter}.clean"), String::new()),
|
||||
(format!("filter.{filter}.smudge"), String::new()),
|
||||
(format!("filter.{filter}.required"), "false".to_owned()),
|
||||
]
|
||||
}),
|
||||
));
|
||||
}
|
||||
let output = command.args(args).output().context("failed to start git")?;
|
||||
ensure_git_success(&output)?;
|
||||
Ok(output)
|
||||
}
|
||||
|
||||
pub(crate) fn git_stdout<I, S>(cwd: &Path, args: I) -> Result<String>
|
||||
where
|
||||
I: IntoIterator<Item = S>,
|
||||
S: AsRef<OsStr>,
|
||||
{
|
||||
let output = git_output(cwd, GitOperation::WorkingTree, args)?;
|
||||
let stdout = String::from_utf8(output.stdout).context("git output is not valid UTF-8")?;
|
||||
Ok(stdout.trim().to_owned())
|
||||
}
|
||||
|
||||
pub(crate) fn git_path<I, S>(cwd: &Path, args: I) -> Result<PathBuf>
|
||||
where
|
||||
I: IntoIterator<Item = S>,
|
||||
S: AsRef<OsStr>,
|
||||
{
|
||||
let output = base_git_command(cwd)
|
||||
.args(args)
|
||||
.output()
|
||||
.context("failed to start git")?;
|
||||
if !output.status.success() {
|
||||
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||
bail!("git command failed: {}", stderr.trim());
|
||||
}
|
||||
let output = git_output(cwd, GitOperation::Metadata, args)?;
|
||||
let bytes = output.stdout.strip_suffix(b"\n").unwrap_or(&output.stdout);
|
||||
#[cfg(windows)]
|
||||
let bytes = bytes.strip_suffix(b"\r").unwrap_or(bytes);
|
||||
@@ -59,6 +100,7 @@ fn base_git_command(cwd: &Path) -> Command {
|
||||
// repository from cwd, and install only our own per-command config below.
|
||||
for name in [
|
||||
"GIT_ALTERNATE_OBJECT_DIRECTORIES",
|
||||
"GIT_CEILING_DIRECTORIES",
|
||||
"GIT_CONFIG",
|
||||
"GIT_CONFIG_PARAMETERS",
|
||||
"GIT_CONFIG_COUNT",
|
||||
@@ -93,3 +135,49 @@ fn base_git_command(cwd: &Path) -> Command {
|
||||
scrub_non_inheritable_env_vars(&mut command);
|
||||
command
|
||||
}
|
||||
|
||||
fn configured_filters(cwd: &Path) -> Result<BTreeSet<String>> {
|
||||
let output = base_git_command(cwd)
|
||||
.args([
|
||||
"config",
|
||||
"--null",
|
||||
"--name-only",
|
||||
"--get-regexp",
|
||||
"^filter\\.",
|
||||
])
|
||||
.output()
|
||||
.context("failed to inspect Git filter configuration")?;
|
||||
|
||||
if !output.status.success() {
|
||||
if output.status.code() == Some(1) {
|
||||
return Ok(BTreeSet::new());
|
||||
}
|
||||
ensure_git_success(&output)?;
|
||||
}
|
||||
|
||||
let mut filters = BTreeSet::new();
|
||||
let names = String::from_utf8(output.stdout).context("Git filter names are not valid UTF-8")?;
|
||||
for name in names.split('\0') {
|
||||
if let Some((driver, attribute)) = name
|
||||
.strip_prefix("filter.")
|
||||
.and_then(|name| name.rsplit_once('.'))
|
||||
&& !driver.is_empty()
|
||||
&& matches!(attribute, "clean" | "smudge" | "process" | "required")
|
||||
{
|
||||
filters.insert(driver.to_owned());
|
||||
}
|
||||
}
|
||||
Ok(filters)
|
||||
}
|
||||
|
||||
fn ensure_git_success(output: &Output) -> Result<()> {
|
||||
if output.status.success() {
|
||||
return Ok(());
|
||||
}
|
||||
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||
bail!("git command failed: {}", stderr.trim())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "git_tests.rs"]
|
||||
mod tests;
|
||||
Reference in new issue
Block a user