update-shape.py apply --accept-local: a kept .py copy that imports a name the run's new repo_shape.py dropped passes, and make bootstrap then dies on an ImportError

apply --accept-local should check each kept .py copy's imports against the modules the run writes, before writing anything.

From the checklist triage of 2026-10-15; Brett Heap approved its recommendations at 2026-10-15T16:49:38Z. One pull request covers the lines below.

Lines

R562: apply --accept-local keeps a project's .py copy importing a name the run's NEW repo_shape.py lacks. Where: update-shape.py _refuse_kept_copies_missing_names, _kept_copies_lacking (:3620-3741). Effort M; all. On main 26c1600: Probe at 26c1600 (revimport/): with bootstrap.py edited to import shell_line, apply --at e6fbd748 --accept-local scripts/bootstrap.py exited 0 (pins ok, manifest ok) and bootstrap.py --help exited 1 with ImportError: cannot import name 'shell_line', because update-shape.py: apply refuses to keep an --accept-local copy of a helper that lacks a name a copy it writes imports from it, before anything is written, so a kept scripts/repo_shape.py no longer leaves make bootstrap dying on an ImportError after the validators passed (#536) #562 treats only the copies the run WRITES as importers; upstream has dropped public repo_shape names before (cac6bb2 dropped two). (source)

Each line above is marked → this issue on its tracking issue. Tick it there too when this closes.

The lines as written on the tracking issues

update-shape.py apply --accept-local <a kept .py copy> can keep a project's own helper that imports a name the run's NEW scripts/repo_shape.py no longer defines.

The case: an upstream commit drops shell_line from scripts/repo_shape.py, and the project has a committed edit to scripts/bootstrap.py that imports it (row locally-modified).

What happens: apply --accept-local scripts/bootstrap.py exits 0 (pins ok, manifest ok). The next scripts/bootstrap.py --help exits 1 with ImportError: cannot import name 'shell_line' from 'repo_shape'.

The other direction is covered: update-shape.py: apply refuses to keep an --accept-local copy of a helper that lacks a name a copy it writes imports from it, before anything is written, so a kept scripts/repo_shape.py no longer leaves make bootstrap dying on an ImportError after the validators passed (#536) #562 (update-shape.py apply --accept-local scripts/repo_shape.py can keep an old helper that a newly copied file imports from, and make bootstrap then fails with ImportError #536) refuses a WRITTEN copy that imports from a KEPT module. This line is the reverse.

A kept validator in this position is caught only by the validators' rollback.

— #458, comment

CLAIMED — lane openRepoShape-4, session 11c6c0ef-495a-4a05-94cf-811b7b0a1012@Eagle, 2026-10-15T17:34:15Z, for #604

Logged in lanes/log/openRepoShape-4.md at e23659eb42554367b8fbea4364b829c204920bcd.

The three reads (lane-collision-protocol Rule 1):

1. existing `CLAIMED —` comments on opensoft/openRepoShape#604:
   none
2. `gh pr list --repo opensoft/openRepoShape --state all --search "#604"`, kept where the row or its body names `#604`:
   none
3. `git ls-remote --heads git@github.com:opensoft/openRepoShape` branches naming `604` as a whole token:
   none

update-shape.py: the missing-name refusal's remediation names which l…

the family root's siblings.py takes `member_make_env` from its bootst…

the family root's bootstrap.py and siblings.py: the jobserver functio…

the family root's bootstrap.py and siblings.py: under GNU make 4.4's …

the family root's siblings.py: with a token in use, the clone and the…

update-shape.py: `update-accept-local-missing-name` asks a copy an ea…

Navigation Menu

Repository navigation

update-shape.py `apply --accept-local`: a kept `.py` copy that imports a name the run's new `repo_shape.py` dropped passes, and `make bootstrap` then dies on an ImportError #604

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

update-shape.py apply --accept-local: a kept .py copy that imports a name the run's new repo_shape.py dropped passes, and make bootstrap then dies on an ImportError #604

Description

Activity

brettheap commented on Oct 15, 2026

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions

update-shape.py `apply --accept-local`: a kept `.py` copy that imports a name the run's new `repo_shape.py` dropped passes, and `make bootstrap` then dies on an ImportError #604