Igor Sheludko
107e13c472
Ensure create_worktree.sh halts immediately if git worktree add or setup_worktree_build.py fails, avoiding partially initialized worktree directories. Add validation in setup_worktree_build.py to ensure the target directory exists and contains a .git entry before acquiring locks or creating directories. TAG=agy CONV=67ede365-803b-4edb-afda-a8c209ae3a22 No-Tree-Checks: true No-Try: true Change-Id: Ied38ae0e15be54001ea3d593347fdd8cac1d99ad Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/8352624 Auto-Submit: Igor Sheludko <ishell@chromium.org> Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/heads/main@{#109657}
65 lines
1.9 KiB
Bash
Executable File
65 lines
1.9 KiB
Bash
Executable File
#!/bin/bash
|
|
# Copyright 2026 the V8 project authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
TASK_ID=$1
|
|
if [ -z "$TASK_ID" ]; then
|
|
echo "Usage: create_worktree.sh <task_id>"
|
|
exit 1
|
|
fi
|
|
|
|
TOPLEVEL=$(git rev-parse --show-toplevel 2>/dev/null)
|
|
COMMON_DIR=$(git rev-parse --git-common-dir 2>/dev/null)
|
|
if [ -z "$COMMON_DIR" ] || [ -z "$TOPLEVEL" ]; then
|
|
echo "Error: Not in a git repository."
|
|
exit 1
|
|
fi
|
|
V8_ROOT="$(cd "$COMMON_DIR/.." && pwd)"
|
|
WS_ROOT="$(dirname "$TOPLEVEL")"
|
|
|
|
if command -v rift >/dev/null 2>&1 && [ -f "$WS_ROOT/.rift_prime_directive.json" ]; then
|
|
CURRENT_WS="$(basename "$WS_ROOT")"
|
|
RIFT_PARENT_DIR="$(dirname "$WS_ROOT")"
|
|
REPO_DIR_NAME="$(basename "$TOPLEVEL")"
|
|
|
|
if [[ "$TASK_ID" == "${CURRENT_WS}_subagent_"* ]]; then
|
|
SUBAGENT_WS="$TASK_ID"
|
|
else
|
|
SUBAGENT_WS="${CURRENT_WS}_subagent_${TASK_ID}"
|
|
fi
|
|
WORKTREE_PATH="$RIFT_PARENT_DIR/$SUBAGENT_WS/$REPO_DIR_NAME"
|
|
|
|
if [ ! -d "$WORKTREE_PATH" ]; then
|
|
# Attempt Rift's subagent fork command as documented in the rift skill.
|
|
# Fallback to standard 'rift fork' if the subagent subcommand fails or is unsupported.
|
|
if ! rift -y subagent fork "$TASK_ID" > /dev/null 2>&1; then
|
|
rift fork -y "$SUBAGENT_WS" --no-build > /dev/null 2>&1
|
|
fi
|
|
fi
|
|
|
|
if [ ! -d "$WORKTREE_PATH" ]; then
|
|
echo "Error: Failed to create rift workspace $SUBAGENT_WS" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "$WORKTREE_PATH"
|
|
exit 0
|
|
fi
|
|
|
|
BRANCH_NAME="task-$TASK_ID"
|
|
WORKTREE_PATH="$V8_ROOT/worktrees/$BRANCH_NAME"
|
|
|
|
mkdir -p "$V8_ROOT/worktrees"
|
|
|
|
if ! git worktree add -b "$BRANCH_NAME" "$WORKTREE_PATH" origin/main; then
|
|
echo "Error: Failed to create git worktree at $WORKTREE_PATH" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if ! python3 "$V8_ROOT/tools/dev/setup_worktree_build.py" "$V8_ROOT" "$WORKTREE_PATH"; then
|
|
echo "Error: Failed to set up dependencies for $WORKTREE_PATH" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "$WORKTREE_PATH"
|