From nobody Tue Sep 06 19:32:22 2022 X-Original-To: dev-commits-src-branches@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 4MMbBG2WYFz4bWXk; Tue, 6 Sep 2022 19:32:22 +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 4MMbBG1mgPz3g1g; Tue, 6 Sep 2022 19:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662492742; 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=gLsbjmU/SXZ4Wq7ZiunsgNCFkIIaqTp8sDveP8r8Z6E=; b=EpJqMYxiKFb+21GyI8gVu/HwWICfcx//AmnerD/buiB511YcZiqxOwhfHYbEd3bfEQz9vP SIVDSF9hH3JJ9I6SSg72n4915kAFd0RhKFHwxQkMduBn9EIEq8V1mVmLRF8We3UvpXaz7L KkLVJKg0gWCKu0zq4R/x3WbH5JiMCSZU0OsD7SRX6g1B48K7ekyJwJAUKG9N8QpTgZ7zHa 2dOXDZJnRSJTct3YEU3QUvlsjTLohm/jcr6JtSdrcDeo32ITWtN+ulSZrm5ucGpnCmRSpE ON8bc+vfZHbqEZn3fJ9s8vdRYtDRpWuJF4Xt//lcqen6lTxkYm15YwYzIhvR5w== 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 4MMbBG0pjtzH6S; Tue, 6 Sep 2022 19:32:22 +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 286JWMHO044272; Tue, 6 Sep 2022 19:32:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 286JWMxn044271; Tue, 6 Sep 2022 19:32:22 GMT (envelope-from git) Date: Tue, 6 Sep 2022 19:32:22 GMT Message-Id: <202209061932.286JWMxn044271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a3c92efcaa12 - stable/12 - newvers.sh: add support for gitup(1) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a3c92efcaa1252bcff87884a76e7c4a9f2c4afc5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662492742; 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=gLsbjmU/SXZ4Wq7ZiunsgNCFkIIaqTp8sDveP8r8Z6E=; b=cOIzN1TUKz2n5CmpRi7RTYKm0vi+86dWsC/NaDJrvxSjEvVTDzcGENlSXrOi+Rlom9eiCe sCLwrvpyJoSrapZxrYO+zJFo8jv4nkIrK2Bk5ZLBo5ilg6v1jrWzIJD7vBkRf5X3Q3/iQq Ls3m6/l0IWAk9vqr90vMbveduUrVeGrIfwQdsj0OZWQh6D68lkR1P/OjM3loajJITK4Trj O75VDbs22Uta4UPTqbKWanAIjO2r2o5VhsundM2s1B780xStGGijbjREx4vj+OQ39AHiF2 ffAmgJQXBpcqrexKHbMDj5JD71+2X2XXSE3V6nykDn99bS1mxMEda0OGPFuK4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662492742; a=rsa-sha256; cv=none; b=CDizZ+G6mWWAT7B7acazIE8O/kooUebnv4ccFSvrS2+91P5vk49oAwKaUhgELNcfGXfsqp TordtxPx3kDTSdAW3/Ioh99+CH/szqtCLJRrJpSe5drrKBh3pdBBKJgLjAMpS6oy7ddhBt ve1yaaiKRvZ7Kza0xbUtjBLX7uEwY54pL8wPgyuYd1PrI8HaUcY3qAQxuwvHJDaaLYkzq2 Uc0/SpnFbCotKnL7nQnpg6mj6IuUmij3JUnBa4mQ5tIeF37HgfRBm/5BP+jx7/ncplJI0U tAYHNaf5X1cEO5pd898orkzJQ+gklUFNwVqiOwQQy4/Z26Xt30NBumiW87RJIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a3c92efcaa1252bcff87884a76e7c4a9f2c4afc5 commit a3c92efcaa1252bcff87884a76e7c4a9f2c4afc5 Author: Michael Osipov AuthorDate: 2021-01-05 10:48:39 +0000 Commit: Ed Maste CommitDate: 2022-09-06 19:31:39 +0000 newvers.sh: add support for gitup(1) gitup writes a .gituprevision file into the shallow clone directory. Read that file and print commit information only. Submitted by: Michael Osipov Pull Request: https://github.com/freebsd/freebsd-src/pull/449 While here, drop the redundant branch name from the git output and don't count commits in shallow clones. Reported by: Michael Osipov MFC after: 2 weeks PR: 252507 (cherry picked from commit a9fc14fbf445cffd18f34f6a602bdba84bb5a867) --- sys/conf/newvers.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 542dae42b567..f8511a3f5912 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -190,6 +190,10 @@ if findvcs .git; then done fi +if findvcs .gituprevision; then + gituprevision="${VCSTOP}/.gituprevision" +fi + if findvcs .hg; then for dir in /usr/bin /usr/local/bin; do if [ -x "${dir}/hg" ] ; then @@ -217,9 +221,11 @@ fi if [ -n "$git_cmd" ] ; then git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null) - git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null) - if [ -n "$git_cnt" ] ; then - git="n${git_cnt}-${git}" + if [ "$(git rev-parse --is-shallow-repository)" = false ] ; then + git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null) + if [ -n "$git_cnt" ] ; then + git="n${git_cnt}-${git}" + fi fi git_b=$($git_cmd rev-parse --abbrev-ref HEAD) if [ -n "$git_b" -a "$git_b" != "HEAD" ] ; then @@ -232,6 +238,10 @@ if [ -n "$git_cmd" ] ; then git=" ${git}" fi +if [ -n "$gituprevision" ] ; then + gitup=" $(awk -F: '{print $2}' $gituprevision)" +fi + if [ -n "$p4_cmd" ] ; then p4version=`cd ${SYSDIR} && $p4_cmd changes -m1 "./...#have" 2>&1 | \ awk '{ print $2 }'` @@ -278,10 +288,10 @@ done shift $((OPTIND - 1)) if [ -z "${include_metadata}" ]; then - VERINFO="${VERSION}${svn}${git}${hg}${p4version} ${i}" + VERINFO="${VERSION}${svn}${git}${gitup}${hg}${p4version} ${i}" VERSTR="${VERINFO}\\n" else - VERINFO="${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}" + VERINFO="${VERSION} #${v}${svn}${git}${gitup}${hg}${p4version}: ${t}" VERSTR="${VERINFO}\\n ${u}@${h}:${d}\\n" fi