zsp/everything-claude-code
1
0
Fork 0
mirror of https://github.com/affaan-m/everything-claude-code.git synced 2026-04-11 03:43:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: default ecc2 worktrees through policy

Browse Source
This commit is contained in:
Affaan Mustafa
2026-04-08 15:58:31 -07:00
parent 86cbe3d616
commit b3f781a648
8 changed files with 576 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ecc2/src/worktree/mod.rs
View File

@@ -237,7 +237,12 @@ pub fn merge_readiness(worktree: &WorktreeInfo) -> Result<MergeReadiness> {
let output = Command::new("git")
.arg("-C")
.arg(&worktree.path)
.args(["merge-tree", "--write-tree", &worktree.base_branch, &worktree.branch])
.args([
"merge-tree",
"--write-tree",
&worktree.base_branch,
&worktree.branch,
])
.output()
.context("Failed to generate merge readiness preview")?;
@@ -519,7 +524,8 @@ fn base_checkout_path(worktree: &WorktreeInfo) -> Result<PathBuf> {
if fallback.is_none() && path != worktree.path {
fallback = Some(path.clone());
}
if current_branch.as_deref() == Some(target_branch.as_str()) && path != worktree.path
if current_branch.as_deref() == Some(target_branch.as_str())
&& path != worktree.path
{
return Ok(path);
}
@@ -660,16 +666,12 @@ mod tests {
};
let preview = diff_file_preview(&info, 6)?;
assert!(
preview
.iter()
.any(|line| line.contains("Branch A") && line.contains("src.txt"))
);
assert!(
preview
.iter()
.any(|line| line.contains("Working M") && line.contains("README.md"))
);
assert!(preview
.iter()
.any(|line| line.contains("Branch A") && line.contains("src.txt")));
assert!(preview
.iter()
.any(|line| line.contains("Working M") && line.contains("README.md")));
let _ = Command::new("git")
.arg("-C")
@@ -736,7 +738,8 @@ mod tests {
#[test]
fn merge_readiness_reports_ready_worktree() -> Result<()> {
let root = std::env::temp_dir().join(format!("ecc2-worktree-merge-ready-{}", Uuid::new_v4()));
let root =
std::env::temp_dir().join(format!("ecc2-worktree-merge-ready-{}", Uuid::new_v4()));
let repo = root.join("repo");
fs::create_dir_all(&repo)?;
@@ -787,7 +790,8 @@ mod tests {
#[test]
fn merge_readiness_reports_conflicted_worktree() -> Result<()> {
let root = std::env::temp_dir().join(format!("ecc2-worktree-merge-conflict-{}", Uuid::new_v4()));
let root =
std::env::temp_dir().join(format!("ecc2-worktree-merge-conflict-{}", Uuid::new_v4()));
let repo = root.join("repo");
fs::create_dir_all(&repo)?;