From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 7BCD7385841A for ; Mon, 6 Sep 2021 09:54:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BCD7385841A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-195-nrnPpOq-NZm85dBdF5XGWQ-1; Mon, 06 Sep 2021 05:54:11 -0400 X-MC-Unique: nrnPpOq-NZm85dBdF5XGWQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBEA71876586; Mon, 6 Sep 2021 09:54:09 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 725C160657; Mon, 6 Sep 2021 09:54:08 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.16.1/8.16.1) with ESMTPS id 1869s6UB3012162 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 6 Sep 2021 11:54:07 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.16.1/8.16.1/Submit) id 1869s2Wm3012159; Mon, 6 Sep 2021 11:54:02 +0200 Date: Mon, 6 Sep 2021 11:54:02 +0200 From: Jakub Jelinek To: Serge Belyshev Cc: GCC Patches , Iain Sandoe , Richard Biener Subject: Re: [PATCH v3] gcc_update: use human readable name for revision string in gcc/REVISION Message-ID: <20210906095402.GR920497@tucnak> Reply-To: Jakub Jelinek References: <20210716072941.GC2380545@tucnak> <20210716093608.GF2380545@tucnak> <8735se1r4b.fsf_-_@depni.sinp.msu.ru> <20210719110915.GP2380545@tucnak> <87eebuzgw3.fsf_-_@depni.sinp.msu.ru> <87v93eghk1.fsf@depni.sinp.msu.ru> MIME-Version: 1.0 In-Reply-To: <87v93eghk1.fsf@depni.sinp.msu.ru> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 09:54:18 -0000 On Mon, Sep 06, 2021 at 12:49:18PM +0300, Serge Belyshev wrote: * gcc_update: derive human readable name for HEAD using git describe After : start with upper case, ^^^ Derive like "git gcc-descr" with short commit hash. Drop "revision" from gcc/REVISION. Too long line. Otherwise LGTM. > > --- a/contrib/gcc_update > > +++ b/contrib/gcc_update > > @@ -332,7 +332,22 @@ case $vcs_type in > > exit 1 > > fi > > > > - revision=`$GCC_GIT log -n1 --pretty=tformat:%p:%t:%H` > > + # Open-coded version of "git gcc-descr" from contrib/gcc-git-customization.sh > > + revision=`$GCC_GIT log -n1 --pretty=tformat:%h` > > + r=`$GCC_GIT describe --all --match 'basepoints/gcc-[0-9]*' HEAD \ > > + | sed -n 's,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)-\([0-9]\+\)-g[0-9a-f]*$,r\2-\3,p;s,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)$,r\2-0,p'`; > > + if test -n $r; then > > + o=`$GCC_GIT config --get gcc-config.upstream`; > > + rr=`echo $r | sed -n 's,^r\([0-9]\+\)-[0-9]\+\(-g[0-9a-f]\+\)\?$,\1,p'`; > > + if $GCC_GIT rev-parse --verify --quiet ${o:-origin}/releases/gcc-$rr >/dev/null; then > > + m=releases/gcc-$rr; > > + else > > + m=master; > > + fi; > > + if $GCC_GIT merge-base --is-ancestor HEAD ${o:-origin}/$m; then > > + revision=${r}-g${revision}; > > + fi > > + fi > > branch=`$GCC_GIT name-rev --name-only HEAD || :` > > ;; > > > > @@ -414,6 +429,6 @@ rm -f LAST_UPDATED gcc/REVISION > > date > > echo "`TZ=UTC date` (revision $revision)" > > } > LAST_UPDATED > > -echo "[$branch revision $revision]" > gcc/REVISION > > +echo "[$branch $revision]" > gcc/REVISION > > > > touch_files_reexec Jakub