70 lines
3.6 KiB
Python
70 lines
3.6 KiB
Python
"""Move a checkout to this repo's newest release, as a bare `deploy-release` does."""
|
|
from failure import Failure
|
|
from git_cli.git_repo import git
|
|
from release_plan.release import newest_tag, parsed, tagged
|
|
from text_files.markdown_text import sections
|
|
|
|
|
|
def deploy(checkout: str) -> str | Failure:
|
|
"""What the move of checkout to the newest release did, as the tool prints it; a Failure where it refused or git failed."""
|
|
fetched = git("fetch", "--quiet", "--tags", "origin", cwd=checkout)
|
|
if isinstance(fetched, Failure):
|
|
return fetched
|
|
tag = newest_tag(checkout)
|
|
if isinstance(tag, Failure):
|
|
return tag
|
|
if tag is None:
|
|
return Failure("origin has no v* tag to move to")
|
|
# Re-reads each file through the clean filter, so a model pick alone leaves settings.json unchanged.
|
|
if isinstance(refreshed := git("update-index", "-q", "--refresh", cwd=checkout), Failure):
|
|
return refreshed
|
|
changed = git("diff", "--name-only", "HEAD", cwd=checkout)
|
|
if isinstance(changed, Failure):
|
|
return changed
|
|
unreleased = git("diff", "--name-only", tag, "--", *changed.split(), cwd=checkout) if changed.split() else ""
|
|
if isinstance(unreleased, Failure):
|
|
return unreleased
|
|
if unreleased.split():
|
|
return Failure(f"{checkout} has uncommitted changes that {tag} doesn't hold, to {', '.join(unreleased.split())}: merge them through the development clone and cut a release first")
|
|
old = git("describe", "--tags", "--abbrev=0", "--match", "v*", "HEAD", cwd=checkout)
|
|
old_tag = None if isinstance(old, Failure) else old.strip()
|
|
at_tag = git("describe", "--tags", "--exact-match", "--match", "v*", "HEAD", cwd=checkout)
|
|
if not isinstance(at_tag, Failure) and at_tag.strip() == tag:
|
|
return f"Already on {tag}, the newest release."
|
|
if isinstance(git("merge-base", "--is-ancestor", "HEAD", tag, cwd=checkout), Failure):
|
|
return Failure(f"{tag} doesn't hold the checkout's commit, so the move would drop work no release holds: cut a release that holds it first")
|
|
settings_changed = isinstance(git("diff", "--quiet", "HEAD", tag, "--", "settings.json", cwd=checkout), Failure)
|
|
# The tag holds each uncommitted change, so undoing them doesn't lose anything, and lets the checkout below take the tag's copy.
|
|
# A settings.json the clean filter shows unchanged may still differ on disk, by a model pick or Claude Code's key order, which checkout refuses to overwrite; the pick is asked for again below.
|
|
tracked = git("ls-files", "--", "settings.json", cwd=checkout)
|
|
if isinstance(tracked, Failure):
|
|
return tracked
|
|
set_aside = sorted({*changed.split(), *tracked.split()} if settings_changed else set(changed.split()))
|
|
if set_aside:
|
|
restored = git("checkout", "--quiet", "HEAD", "--", *set_aside, cwd=checkout)
|
|
if isinstance(restored, Failure):
|
|
return restored
|
|
moved = git("checkout", "--quiet", "--detach", tag, cwd=checkout)
|
|
if isinstance(moved, Failure):
|
|
return moved
|
|
changelog = git("show", f"{tag}:CHANGELOG.md", cwd=checkout)
|
|
lines = [f"Moved from {old_tag or 'an untagged commit'} to {tag}."]
|
|
if settings_changed:
|
|
lines.append("settings.json changed: pick the model again with /model.")
|
|
if not isinstance(changelog, Failure):
|
|
lines += newer_sections(changelog, old_tag)
|
|
return "\n\n".join(lines)
|
|
|
|
|
|
def newer_sections(changelog: str, old_tag: str | None) -> list[str]:
|
|
"""Each `## <version>` section of changelog newer than old_tag, newest first, as it reads."""
|
|
since = tagged(old_tag)
|
|
found = []
|
|
for heading, bodies in sections(changelog).items():
|
|
named = parsed(heading)
|
|
if named is None:
|
|
continue
|
|
if since is None or named > since:
|
|
found.append(f"## {heading}\n\n" + "\n".join(bodies))
|
|
return found
|