054392abbe
39 commits, squashed; the originals stay reachable from tag archive/merge-main-develop. These commits sit on several merged branches, so the wave holds their combined result. - 1b17dd7f5 brett19: Merge fixes: every crate and test target compiles on the merged tree, but for crates/geom's hlr - 8f2c11da2 brett19: Drawings hidden lines: read develop's B-rep records - c30ca0216 brett19: Hidden-line fixtures: build develop's records from the fixtures' data - 5dd2509ae brett19: Hidden lines: tests of the bounded edges, face charts and placed revolutions - 1642df0ea brett19: drawing-hlr doc: what is drawn and refused on develop's records - ddcb80c8e brett19: hlr tests: a placed revolution is refused when its placement is not rigid - e4977721f brett19: Hidden lines: a traced intersection is drawn only where its spline lies on both surfaces - b3ef6ae52 brett19: Hidden lines: kernel bodies through the production prepare against closed forms - 4cd2ae062 brett19: Tests from main: the world state is a Result here - 51d7ad09e brett19: A blend's pick measures close edges on their curves, not their polylines - 11a89713c brett19: Merge fixes from the first SMLib test pass - 48fcb7aac brett19: Merge fixes from the ui test pass and the gates - abd739855 brett19: A silhouette takes its facing from the surface's normals - 85114c5a2 brett19: Clippy and rustfmt on the merged tree - 55a46569f brett19: Stepwise open checks every feature under the session's mode - 4627402e4 brett19: Clippy without SMLib: the planar-sheet edge reader is built only with it - 5fbece0ac brett19: STEP import: a ball's halves whose seams are off each other's quarter lines each form within one turn - eb78d20b0 brett19: Lid ring sketch test: find the ring under the pick, not by main's kernel's name - 3048d8c49 brett19: Viewport culling test: each box's triangles from its mesh, not 12 - dc88b80e2 brett19: Timeline chip test: a fillet that really reduces - 876203621 brett19: Edge names: a seam names its one face once; the curve-id test reads every edge kernel-neutrally - 900635710 brett19: rustfmt on the merged tree - b7e83cd7c brett19: Known failing on SMLib: two of main's new tests assume truck's box mesh and fillet torus - 63bde053a jyviko: Locales: Vietnamese for the setback-too-short refusal, now that vi is a complete catalog - 967a1caa6 brett19: Kernel rig: exact volumes for 1213's bent-tube round and 4782's bar round, rel 1e-6 - 82c821d2a brett19: After the merge: clippy's auto-deref, and the mesh-decisions list for the merged tree - 5862ee223 brett19: After the merge: main's new tests on the SMLib kernel - be78372b2 brett19: Twisted sweep: circles about a straight path are exact cylinders (solidcore#2184) - 312d14500 jyviko: After the merge: a hole that misses is found by exact boxes; a face is a one-face patch; main's mesh-box helpers gone - 6f7e51acb jyviko: After the merge: split_move's Result reaches its callers; to_local's duplicated move check goes - 8f0c79b20 jyviko: After the merge: main's two new tests take world_state's Result, as the rest of their files do - 5f4d70061 jyviko: After the merge with main: its new code on develop's exact bounds, types and thread fields - 2b2ab6627 jyviko: Cargo.lock: develop's profile, smlib and step crates at main's 0.30.1 - e6a4b0a9a jyviko: Kernel rig: main's six new sketch-only commands are exempt from a kernel case - 5acbd2e71 jyviko: Cuts leave the bodies their tools can't reach, by exact boxes (#10225 on exact geometry) - d2b202307 jyviko: Kernel rig: main's new view, rendering, appearance and settings commands are exempt from a case - 21db090ba jyviko: Kernel rig: construct.plane.axis_point gets construction cases - c1f45cae2 jyviko: Kernel rig: assembly cases for mass properties, align, find limits and moving items between parts - 084695416 jyviko: Kernel rig: export and print face cases in the import area Co-authored-by: jyviko <2501648+jyviko@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ
57 lines
3.2 KiB
Bash
Executable File
57 lines
3.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Checks the design-format change files (crates/doc/src/format/): two branches that each add a
|
|
# pending change merge without a conflict, and the release fold moves both into the next number.
|
|
# A drawing-format change (crates/doc/src/drawing/format/) folds into the drawing's own next number.
|
|
# The order they apply in and the upgrades themselves are tested in crates/doc/src/format.rs.
|
|
set -euo pipefail
|
|
|
|
root=$(git rev-parse --show-toplevel)
|
|
tmp=$(mktemp -d)
|
|
trap 'rm -rf "$tmp"' EXIT
|
|
repo="$tmp/repo"
|
|
mkdir -p "$repo/crates/doc/src/drawing" "$repo/scripts"
|
|
cp -r "$root/crates/doc/src/format" "$repo/crates/doc/src/"
|
|
cp -r "$root/crates/doc/src/drawing/format" "$repo/crates/doc/src/drawing/"
|
|
cp "$root/crates/doc/build.rs" "$repo/crates/doc/"
|
|
cp "$root/scripts/fold-format-pending.sh" "$repo/scripts/"
|
|
rm -f "$repo"/crates/doc/src/format/pending/*.rs "$repo"/crates/doc/src/drawing/format/pending/*.rs # start from a release: nothing pending
|
|
git() { command git -C "$repo" -c user.name=test -c user.email=test@example.com "$@"; }
|
|
git init -q -b main
|
|
git add -A
|
|
git commit -qm base
|
|
|
|
change() {
|
|
git switch -q -c "$1" main
|
|
printf '//! %s\n' "$1" > "$repo/crates/doc/src/${2:-format}/pending/$1.rs"
|
|
git add -A
|
|
git commit -qm "$1"
|
|
}
|
|
change b-second
|
|
change a-first
|
|
change c-drawing drawing/format
|
|
|
|
git switch -q main
|
|
if ! tree=$(git merge-tree --write-tree a-first b-second); then
|
|
echo "FAIL: two pending format changes conflict" >&2
|
|
exit 1
|
|
fi
|
|
git merge -q --no-edit a-first b-second >/dev/null
|
|
listed=$(git ls-tree --name-only HEAD crates/doc/src/format/pending/ | grep '\.rs$' | sed 's#.*/##' | tr '\n' ' ')
|
|
[ "$listed" = "a-first.rs b-second.rs " ] || { echo "FAIL: merged pending changes are: $listed" >&2; exit 1; }
|
|
[ "$tree" = "$(git rev-parse HEAD^{tree})" ] || { echo "FAIL: merge-tree and merge disagree" >&2; exit 1; }
|
|
git merge -q --no-edit c-drawing >/dev/null
|
|
|
|
before=$(ls -d "$repo"/crates/doc/src/format/v*/ 2>/dev/null | wc -l)
|
|
drawings=$(find "$repo/crates/doc/src/drawing/format" -mindepth 1 -maxdepth 1 -type d -name 'v*' | wc -l)
|
|
(cd "$repo" && bash scripts/fold-format-pending.sh) > "$tmp/fold.log"
|
|
after=$(ls -d "$repo"/crates/doc/src/format/v*/ | sort -V | tail -1)
|
|
[ "$(ls -d "$repo"/crates/doc/src/format/v*/ | wc -l)" -eq $((before + 1)) ] || { echo "FAIL: the fold made no new version" >&2; exit 1; }
|
|
[ "$(ls "$after")" = "$(printf 'a-first.rs\nb-second.rs')" ] || { echo "FAIL: the fold moved $(ls "$after")" >&2; exit 1; }
|
|
[ -z "$(ls "$repo/crates/doc/src/format/pending/" | grep '\.rs$' || true)" ] || { echo "FAIL: pending changes left after the fold" >&2; exit 1; }
|
|
# A drawing's formats start at 1, so its folded ones are v2/, v3/ and so on: the next is its own, never the design's.
|
|
drawing_next="$repo/crates/doc/src/drawing/format/v$((drawings + 2))"
|
|
[ "$(ls "$drawing_next" 2>/dev/null)" = c-drawing.rs ] || { echo "FAIL: the drawing change did not fold into ${drawing_next##*/}/" >&2; exit 1; }
|
|
second=$(cd "$repo" && bash scripts/fold-format-pending.sh)
|
|
grep -q "No pending format changes" <<< "$second" && ! grep -q "now fixed" <<< "$second" || { echo "FAIL: a second fold did something" >&2; exit 1; }
|
|
echo "ok: pending format changes merge cleanly and fold into $(basename "$after"), a drawing's into ${drawing_next##*/}"
|