From nobody Tue Nov 10 02:15:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jNqxl5pKWz70tkw for ; Tue, 10 Nov 2026 02:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNqxl4spqz4bCb for ; Tue, 10 Nov 2026 02:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794276939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Scps0IZYwgMgEaiRTpJ5Rtv3DsONPnIn9c+n0Zc06Cw=; b=csfwI0ESLjdNU5DeuLfydB3raBDKPk1Z0o66wbxg949ZH7Gx7qzQ3deYZiy7AnzGMAvJ2q 5k1yZRJihQP3fSP3Ji5bWv8I5ZvdK0XpKcaCoJwER0zb+8zJlTDZ7PQsZAFaoLCjo8xqIo sSWQ32tkB7HP9Ni4dry4aF+WQ0qPqhqsKmVtO9NsmhTLIvFImUWwunrVWsYKyb6nECWwPZ FPaxoLVYMObHNtiKybfOU6Ni3jNrqMpV2vH2tAInCcafMruXhcNP7/efu/7fVq3diiZKhi n3JH8uYBRJq8++YMXerMLCgn1wrDuEHrZbU9DrNDUDtjLiO5n6pn4wEhXIj+hw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794276939; b=k6OzdV86/DlBRQh/1LT8YC2pZ1cXsB3pXEA/Onv1HW2aB6AO0dfVXzmV/3nYDTF47PuTOv wgJiiY6qEJZ+v+H8MzWtD+pO3Gjr7zY85V3e5LwlnUBKdCQFVo0tL2Pq5jLzX77IcMvmdj wHwMh23ohAId4AiU8DP9/308XsMzHqeMMYl0aHDLZvzXjeqI4uFdvWzGGQ1LWFECXV+7ws KXifiW50/+5u/9nxKULCCCwPep2jd7cK46ep/hCJtr/ZIiflARQrCjiubktRtwh5e0EAbV DTgeMBVfORTjfB7NZIbTrJdV3jHPbOpGtjgLAxBtOIwMnQCFQiXt60W3pNLyNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794276939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Scps0IZYwgMgEaiRTpJ5Rtv3DsONPnIn9c+n0Zc06Cw=; b=DgZgsTkhefoA1aFL2D7PtuuyWVAfCZ/Su0V12dYH4iF9OJ+YockjnkasWVzmB0bdjrqYAf vrN3gQjaISKac4gty1bJLkNZYtnB/yqQDueN/taoQwelswAnasQupN1EPfU1Cz4cXWi8eS sGfN3qX6i6bZIHPAPwW9M4pYFpNsAmEkc+aoIMdj8IflXsQCXllNWlrAXuI6Daszc4rPm+ f3WXFyZDgwu6OaQF2FT528TIQm0GYrY/km0s1Et/Id0cxm+p30GMpr3sN+q1l8KAorp5iH /9wBTGmSiDkSiM9P0LriIxQEqDm4DSBcnLodhYUJKNDy2yZkLFEb19fnBVEDEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNqxl4D8jz176t for ; Tue, 10 Nov 2026 02:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a75a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 02:15:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: d02883b3d8d0 - main - tools/git/ghpr: retire List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d02883b3d8d0943fdb98cbc365074263f918908b Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 02:15:39 +0000 Message-Id: <6af27e4b.1a75a.7e5bd54a@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d02883b3d8d0943fdb98cbc365074263f918908b commit d02883b3d8d0943fdb98cbc365074263f918908b Author: Enji Cooper AuthorDate: 2026-11-10 02:15:13 +0000 Commit: Enji Cooper CommitDate: 2026-11-10 02:15:13 +0000 tools/git/ghpr: retire The project under the .../ghpr subdirectory is an earlier version of the tool. A newer/supported iteration of the tool can be found on [GitHub][ghpr-repo]. `ghpr` can be installed via `pkg`, e.g., `pkg install py312-ghpr-5`. Please see the [README.md][readme] for further details. MFC after: 1 month [ghpr-repo]: https://github.com/bsdimp/ghpr/ [readme]: https://github.com/bsdimp/ghpr/blob/main/README.md Reviewed by: dteske Differential Revision: https://reviews.freebsd.org/D61086 --- tools/tools/git/ghpr/README | 5 --- tools/tools/git/ghpr/ghpr-init.sh | 29 --------------- tools/tools/git/ghpr/ghpr-push.sh | 51 --------------------------- tools/tools/git/ghpr/ghpr-stage.sh | 72 -------------------------------------- 4 files changed, 157 deletions(-) diff --git a/tools/tools/git/ghpr/README b/tools/tools/git/ghpr/README deleted file mode 100644 index e07d56b1e09b..000000000000 --- a/tools/tools/git/ghpr/README +++ /dev/null @@ -1,5 +0,0 @@ -These are totally experimental - -Shared for collaboration on writing them, if you aren't -in touch with Warner about them, you may find it's super -tough sledding to use them. diff --git a/tools/tools/git/ghpr/ghpr-init.sh b/tools/tools/git/ghpr/ghpr-init.sh deleted file mode 100644 index 567148b14716..000000000000 --- a/tools/tools/git/ghpr/ghpr-init.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -set -e - -die() { - echo $* - exit 1 -} - -# Create a fresh branch for the staging tree. -BRANCH=${1:-staging} -base=main - -if [ "$(git config branch.${BRANCH}.opabinia)" = "true" ]; then - echo "Branch ${BRANCH} has already been initialized" - # Bail if the branch already exists -else - if git rev-parse --verify ${BRANCH} > /dev/null 2>&1; then - echo "Branch ${BRANCH} already exists, skipping creation, but rebasing to ${base}" - git rebase ${base} ${BRANCH} - else - # Create the branch and tag it as the one we're using for opabinia merging. - echo "Creating ${BRANCH} from ${base} to land changes" - git checkout -b ${BRANCH} ${base} || die "Can't create ${BRANCH}" - fi -fi - -git config set --type bool --all branch.${BRANCH}.opabinia true || die "Can't annotate" -git config set --all branch.${BRANCH}.opabinia.base "${base}" || die "Can't annotate" diff --git a/tools/tools/git/ghpr/ghpr-push.sh b/tools/tools/git/ghpr/ghpr-push.sh deleted file mode 100644 index 1d11f31cc52a..000000000000 --- a/tools/tools/git/ghpr/ghpr-push.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -set -e - -die() { - echo $* - exit 1 -} - -staging=staging -do_pr_branch_push=false - - -# Iteratively try to push all the branches, then push upstream. Repeat until the upstream -# push works... -while true; do - # We'll likely drop pushing to the pull request branches, but that's not - # final, so keep the code, but if false'd out. We'll make it a proper option - # or remove it once the discussion settles down. Only Warner can use it at - # the moment anyway. - if $do_pr_branch_push; then - for pr in $(git config --get-all branch.${staging}.opabinia.prs); do - upstream=$(git config --get branch.${staging}.opabinia.${pr}.upstream) - upstream_branch=$(git config --get branch.${staging}.opabinia.${pr}.upstream-branch) - git push $upstream HEAD:$upstream_branch --force || true # bare git push gives cut and paste line - done - fi - - if ! git push --push-option=confirm-author freebsd HEAD:main; then - git fetch freebsd - git rebase freebsd/main ${staging} - continue - fi - break -done - -# OK, pull and rebase to catchup to these changes... -git checkout main; -git pull --rebase - -# try to cleanup -for pr in $(git config --get-all branch.${staging}.opabinia.prs); do - if ! $do_pr_branch_push; then - gh pr edit $pr --add-label merged - gh pr close $pr --comment "Automated message from ghpr: Thank you for your submission. This PR has been merged to FreeBSD's `main` branch. These changes will appear shortly on our GitHub mirror." - fi - git branch -D PR-${pr} - git config --remove-section branch.${staging}.opabinia.${pr} -done -git config --remove-section branch.${staging}.opabinia -git branch -D ${staging} diff --git a/tools/tools/git/ghpr/ghpr-stage.sh b/tools/tools/git/ghpr/ghpr-stage.sh deleted file mode 100644 index df9eeeeea5a3..000000000000 --- a/tools/tools/git/ghpr/ghpr-stage.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - -set -e - -die() { - echo $* - exit 1 -} - -update_to_upstream() ( - local staging=$1 - local base=$2 - - git checkout ${base} - git pull --rebase - git rebase -i ${base} ${staging} -) - -PR=$1 -staging=staging - -[ -n "${PR}" ] || die "Need a pr" - -if [ "$(git config branch.${staging}.opabinia)" != "true" ]; then - die "Branch ${staging} has not been initialized" -fi - -base=$(git config branch.${staging}.opabinia.base) -[ -n "${base}" ] || die "No base set on ${staging}" - -if [ -z "$(git config --get-all branch.${staging}.opabinia.prs)" ]; then - # Update ${base} if prs list is empty - update_to_upstream ${staging} ${base} -else - # Otherwise checkout staging as is - git checkout ${staging} -fi - -# OK. We always have to create a new branch for the PR. We do this into -# ${base} first (since that's what gh pr checkout does). We then then rebase -# this branch onto the staging branch, doing the rebase rewriting along the -# way. This rather convoluted setup was selected over cherry-picking and/or -# pulling a formatted patch to apply because it always applies it correctly -# and then we use git's tools to merge, pushing the problems there rather than -# trying to deal with them ourselves here. - -# In the future, PR may be a list -# Also, error handling is annoying at best. - -git branch -D PR-$PR || true -gh pr checkout $PR -b PR-$PR - -upstream=$(git config branch.PR-$PR.pushRemote) -upstream_branch=$(git config branch.PR-$PR.merge | sed -e s=refs/heads/==) - -git rebase -i ${base} --onto ${staging} --exec 'env EDITOR=$HOME/bin/git-fixup-editor git commit --amend --trailer "Reviewed-by: imp" --trailer "Pull-Request: https://github.com/freebsd/freebsd-src/pull/'"$PR"'"' -# Save the upstream data -git config --add branch.${staging}.opabinia.prs ${PR} -git config --add branch.${staging}.opabinia.${PR}.upstream ${upstream} -git config --add branch.${staging}.opabinia.${PR}.upstream-branch ${upstream_branch} -# Move the staging branch to the new tip of the tree. -git checkout -B ${staging} HEAD - -# XXX need to somehow scrape the PR for approvals, translate that to FreeBSD's name -# and add that in the Reviewed-by stuff... that's done by hand... - -# Sanity check things... not 100% right, since it checks everything we're queued up so far... -tools/build/checkstyle9.pl ${base}..${staging} - -# Bump .Dd dates? -# run before/after igor? -# Anything else?