From owner-dev-commits-src-all@freebsd.org Sat Dec 26 15:52:28 2020 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 608724BC8A6; Sat, 26 Dec 2020 15:52:28 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D37c619dqz3v11; Sat, 26 Dec 2020 15:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 25D261790E; Sat, 26 Dec 2020 15:52:21 +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 0BQFqK2M082410; Sat, 26 Dec 2020 15:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BQFqKNH082409; Sat, 26 Dec 2020 15:52:20 GMT (envelope-from git) Date: Sat, 26 Dec 2020 15:52:20 GMT Message-Id: <202012261552.0BQFqKNH082409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ulrich Spörlein Subject: git: 8d405efd73d3 - Fix newvers.sh to no longer print an outdated SVN rev MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uqs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d405efd73d3991fe1647f91a2b7c9989dd5f18f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 15:52:28 -0000 The branch main has been updated by uqs: URL: https://cgit.FreeBSD.org/src/commit/?id=8d405efd73d3991fe1647f91a2b7c9989dd5f18f commit 8d405efd73d3991fe1647f91a2b7c9989dd5f18f Author: Ulrich Spörlein AuthorDate: 2020-12-23 21:29:34 +0000 Commit: Ulrich Spörlein CommitDate: 2020-12-26 15:47:43 +0000 Fix newvers.sh to no longer print an outdated SVN rev We have stopped using SVN, so the notes containing the old SVN revisions are no longer populated, so fall back to purely counting the number of commits (currently at about 255337). Also turn the format more into what git-describe produces, with a name first, then the number of commits and the hash last. Note that as we don't tag anything on `main`, git describe will never produce something useful there and finds the newest vendor tag that was merged in instead. Sample output: FreeBSD 13.0-CURRENT #6 main-c255126-gb81783dc98e6-dirty FreeBSD 12.2-STABLE #0 stable/12-c243035-gd16dac42b641-dirty MFC after: 3 weeks Reviewed by: imp, glebius Differential Revision: https://reviews.freebsd.org/D27751 --- sys/conf/newvers.sh | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 5ce93567e3af..b8667844210b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -248,42 +248,19 @@ fi if [ -n "$git_cmd" ] ; then git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null) - gitsvn=$($git_cmd svn find-rev $git 2>/dev/null) - if [ -n "$gitsvn" ] ; then - svn=" r${gitsvn}" - git="=${git}" - else -# Log searches are limited to 10k commits to speed up failures. -# We assume that if a tree is more than 10k commits out-of-sync -# with FreeBSD, it has forked the the OS and the SVN rev no -# longer matters. - gitsvn=$($git_cmd log -n 10000 | - grep '^ git-svn-id:' | head -1 | \ - sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p') - if [ -z "$gitsvn" ] ; then - gitsvn=$($git_cmd log -n 10000 --format='format:%N' | \ - grep '^svn ' | head -1 | \ - sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p') - fi - if [ -n "$gitsvn" ] ; then - svn=" r${gitsvn}" - git="+${git}" - else - git=" ${git}" - fi - fi git_cnt=$($git_cmd rev-list --count HEAD 2>/dev/null) if [ -n "$git_cnt" ] ; then - git="${git}-c${git_cnt}" + git="c${git_cnt}-g${git}" fi git_b=$($git_cmd rev-parse --abbrev-ref HEAD) - if [ -n "$git_b" ] ; then - git="${git}(${git_b})" + if [ -n "$git_b" -a "$git_b" != "HEAD" ] ; then + git="${git_b}-${git}" fi if git_tree_modified; then git="${git}-dirty" modified=yes fi + git=" ${git}" fi if [ -n "$hg_cmd" ] ; then