From nobody Wed May 04 19:48:20 2022 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 2FC951AC7FC2; Wed, 4 May 2022 19:48:21 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KtnSP0lmYz3NHL; Wed, 4 May 2022 19:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651693701; 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=i+G0ztOCvtUjb8s7kdkEyyhlaaCp/2e1nkObUWrXQI8=; b=dcg3UdhnjkMmIGUky2EN1dRknindeWbI53vGOLW6NBrwh9jr8fZJ3D0CiD6WtIq/nFj4jG j4QJJzCAI/mKibGjk0UJz8+gcjALbUDDSwrrpCHVk+mOLMtAy06xx7EroueHsG+1k4XG2r yodFTkivCixydt9rm802vRnAMV4PJt04Gf6dSE3vvDV0/VoJLTc/4zzzgjZV05q8dR3ZgV ZC8M5ef6TZdpt4/XLSMtIEdDWOU4RxdQ3KPdPM/3lqZCiy6PQmA3b/UPzzi5eVcuxTVmV3 rNWmJhItMHVW73jQya3DO51yz0nZTt9i7mpDHgY1Oz+cdpBPdKJ9UZai/82c0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDB55193A3; Wed, 4 May 2022 19:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 244JmKXl084070; Wed, 4 May 2022 19:48:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244JmKfj084069; Wed, 4 May 2022 19:48:20 GMT (envelope-from git) Date: Wed, 4 May 2022 19:48:20 GMT Message-Id: <202205041948.244JmKfj084069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 4b3bf909005a - main - mfc-candidates.sh: Set default target branch for ports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b3bf909005a8b89d55fb27b8dde6128dda61751 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651693701; 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=i+G0ztOCvtUjb8s7kdkEyyhlaaCp/2e1nkObUWrXQI8=; b=JKiQEAC+ovRRElFTETrGBIJG+vXkmUPnTaOfQ0PDV9wGoHRzHzWoC+jT+/Q/iORcDtGLvS /TjXgVmgR8LBgYT3q0oUkwNhjKRFKSH2G8aD9ei4CW093aOOMXnCKDUkYUfkslMbUdCPNk 4q/Zpufm/nsw9C5iRwrVCGG8Tlb8qeQMtxB+MWUwQkopP25twopVZCRbykA65ImrCpq7GX i1/RRdsvaxCQUHbRrKrA+ogqxaT4/QX0DIP48lePPzJiiciUAj7IzVhs2ygA0B2tC4dTKq 6QMZfPrOx35jDPfav+evyRZtypCKWQdBVaI7CK+i+U0/yyAL6qSsbdG8z3TyvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651693701; a=rsa-sha256; cv=none; b=Ba6f5CLl/PxIw1ysahsuR2PH4RMErjc6IhgxiLkcxMRi6CJ0SQAEQeIKyy2BfA1sTYrDBT Li46qC0Z+Bz0eVd5KiJM5qx7UU/cOPTXMEjh3poL5RBGEEldFKX/+2DFOcB5hnf3qDo2vW b33jsj/hh+3gwDi+GWNE1mRXJ5/VAcmgzT/fl9AIpztlkiARD2gf8SsDEwodHvOzBn4GaD N0e3rtWXszmjlTYNkrUGaIKlODQxPVJEd8X9TBLcfAGtm5EFgQc8dIqkPMt1WrhJq148Iw DwumMJtJ7M9OgDEbDUUwLYc2lZJpfA/sPKWnStRsqPKmsADN/HYy0ho/WiJWdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=4b3bf909005a8b89d55fb27b8dde6128dda61751 commit 4b3bf909005a8b89d55fb27b8dde6128dda61751 Author: Joseph Mingrone AuthorDate: 2022-05-04 19:43:20 +0000 Commit: Joseph Mingrone CommitDate: 2022-05-04 19:43:20 +0000 mfc-candidates.sh: Set default target branch for ports Approved by: emaste, jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35096 --- tools/tools/git/mfc-candidates.sh | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index 623edc7174a1..45f3b645e4ba 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -30,21 +30,34 @@ # SUCH DAMAGE. from_branch=freebsd/main -to_branch=freebsd/stable/13 author="${USER}" -# If pwd is a stable or release branch tree, default to it. -cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null) -case $cur_branch in -stable/*) - to_branch=$cur_branch - ;; -releng/*) - to_branch=$cur_branch - major=${cur_branch#releng/} - major=${major%.*} - from_branch=freebsd/stable/$major -esac +# Get the FreeBSD repository +repo=$(basename "$(git remote get-url freebsd 2>/dev/null)" 2>/dev/null) + +if [ "${repo}" = "ports.git" ]; then + year=$(date '+%Y') + month=$(date '+%m') + qtr=$(((month-1) / 3 + 1)) + to_branch="freebsd/${year}Q${qtr}" +elif [ "${repo}" = "src.git" ]; then + to_branch=freebsd/stable/13 + # If pwd is a stable or release branch tree, default to it. + cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null) + case $cur_branch in + stable/*) + to_branch=$cur_branch + ;; + releng/*) + to_branch=$cur_branch + major=${cur_branch#releng/} + major=${major%.*} + from_branch=freebsd/stable/$major + esac +else + echo "pwd is not under a ports or src repository." + exit 0 +fi params() {