v0.1.1

scripts/finish-upstream.sh

@@ -6,13 +6,15 @@ cd "$ROOT"
 
 UI_REVIEWED=0
 ROOT_REVIEWED=0
+OWNED_REVIEWED=0
 SKIP_BUILD=0
 for arg in "$@"; do
   case "$arg" in
     --ui-reviewed) UI_REVIEWED=1 ;;
     --root-reviewed) ROOT_REVIEWED=1 ;;
+    --rustbox-owned-reviewed) OWNED_REVIEWED=1 ;;
     --skip-build) SKIP_BUILD=1 ;;
-    *) echo "usage: $0 [--ui-reviewed] [--root-reviewed] [--skip-build]" >&2; exit 2 ;;
+    *) echo "usage: $0 [--ui-reviewed] [--root-reviewed] [--rustbox-owned-reviewed] [--skip-build]" >&2; exit 2 ;;
   esac
 done
 
@@ -49,6 +51,15 @@ if find . -path ./.git -prune -o -type f \( -name '*.ts' -o -name '*.tsx' \) -pr
   exit 1
 fi
 
+if ! git diff --quiet "$BASE..$TARGET_SHA" -- backend/migrations/ backend/tests/; then
+  if [ "$OWNED_REVIEWED" -ne 1 ]; then
+    echo "error: Oxi changed backend migrations/tests that RustBox owns independently." >&2
+    echo "Review/port only relevant behavior, then rerun with --rustbox-owned-reviewed." >&2
+    git diff --name-status "$BASE..$TARGET_SHA" -- backend/migrations/ backend/tests/ >&2 || true
+    exit 1
+  fi
+fi
+
 if ! git diff --quiet "$BASE..$TARGET_SHA" -- frontend/; then
   if [ "$UI_REVIEWED" -ne 1 ]; then
     echo "error: Oxi frontend changed between $BASE and $TARGET_SHA." >&2

scripts/oxi-port-commit.sh

@@ -34,7 +34,10 @@ tmp_mapped="$(mktemp)"
 cleanup() { rm -f "$tmp_raw" "$tmp_mapped"; }
 trap cleanup EXIT
 
-git diff --binary --find-renames "$PARENT..$SHA" -- backend/ > "$tmp_raw"
+git diff --binary --find-renames "$PARENT..$SHA" -- \
+  backend/ \
+  ':(exclude)backend/migrations/**' \
+  ':(exclude)backend/tests/**' > "$tmp_raw"
 sed \
   -e 's#^diff --git a/backend/#diff --git a/#' \
   -e 's# b/backend/# b/#' \
@@ -56,4 +59,5 @@ fi
 
 printf 'Ported backend portion of Oxi commit %s onto branch %s.\n' "$SHA" "$branch"
 printf 'UPSTREAM_BASE was intentionally NOT changed.\n'
+printf 'Review excluded upstream DB/tests separately: git show %s -- backend/migrations/ backend/tests/\n' "$SHA"
 printf 'Review the original commit, especially frontend changes: git show %s -- frontend/\n' "$SHA"

scripts/oxi-status.sh

@@ -29,8 +29,11 @@ printf '  consumed: %s\n' "$BASE"
 printf '  target:   %s\n' "$TARGET_SHA"
 printf '  commits:  %s\n' "$(git rev-list --count "$BASE..$TARGET_SHA")"
 
-printf '\nOxi backend changes that can be mapped into RustBox root:\n'
-git diff --name-status "$BASE..$TARGET_SHA" -- backend/ || true
+printf '\nOxi backend changes that can be mapped automatically into RustBox root:\n'
+git diff --name-status "$BASE..$TARGET_SHA" -- backend/ ':(exclude)backend/migrations/**' ':(exclude)backend/tests/**' || true
+
+printf '\nOxi backend DB migrations/tests requiring manual review (never auto-imported):\n'
+git diff --name-status "$BASE..$TARGET_SHA" -- backend/migrations/ backend/tests/ || true
 
 printf '\nOxi frontend changes requiring manual RustBox UI port:\n'
 git diff --name-status "$BASE..$TARGET_SHA" -- frontend/ || true

scripts/setup-upstream.sh

@@ -12,7 +12,7 @@ if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
   echo "Initialize it first:" >&2
   echo "  git init" >&2
   echo "  git add ." >&2
-  echo "  git commit -m 'RustBox 0.0.1 baseline'" >&2
+  echo "  git commit -m 'RustBox 0.1.1 baseline'" >&2
   exit 1
 fi
 

scripts/sync-upstream.sh

@@ -45,7 +45,10 @@ tmp_mapped="$(mktemp)"
 cleanup() { rm -f "$tmp_raw" "$tmp_mapped"; }
 trap cleanup EXIT
 
-git diff --binary --find-renames "$BASE..$TARGET_SHA" -- backend/ > "$tmp_raw"
+git diff --binary --find-renames "$BASE..$TARGET_SHA" -- \
+  backend/ \
+  ':(exclude)backend/migrations/**' \
+  ':(exclude)backend/tests/**' > "$tmp_raw"
 sed \
   -e 's#^diff --git a/backend/#diff --git a/#' \
   -e 's# b/backend/# b/#' \
@@ -79,6 +82,8 @@ fi
 
 printf '\nMapped Oxi backend %s -> %s into RustBox on branch %s.\n' "$BASE" "$TARGET_SHA" "$branch"
 printf 'UPSTREAM_BASE remains at %s until the review is explicitly finished.\n' "$BASE"
+printf '\nRustBox-owned upstream backend areas were NOT imported. Review them with:\n'
+printf "  git diff --name-status %s..%s -- backend/migrations/ backend/tests/\n" "$BASE" "$TARGET_SHA"
 printf '\nFrontend changes were NOT imported. Review them with:\n'
 printf '  git diff --name-status %s..%s -- frontend/\n' "$BASE" "$TARGET_SHA"
 printf '  git diff %s..%s -- frontend/\n' "$BASE" "$TARGET_SHA"