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 [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id C98153858D1E for ; Mon, 20 May 2024 07:39:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C98153858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C98153858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716190761; cv=none; b=Q97S2hMtFpYr35+2bxMxtBGujhUbaG5HmlGPV9AVQ0maEnpyQurODRn1Pdn5dZFP5Iwq/ddsZpa4O+HSy6DpqmtMsa7NcYOG5RLVpy3blY8pqpIyAerrFGDUvAEm8Q1zbfOthsNJActw/CvYxtzthFnwYHjEbcNtx3XlbdhRzE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716190761; c=relaxed/simple; bh=ZETFJXinKRUr5wdtG3suytqb92XkOJhECPdCwPehKO0=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=hm1Xn+XcLgnjFsTbyKWkqL/cAGoldPA6q1YHrlYovivRDnbF4aE3u9+OAJHXwSYr2I/l8pmcNZ+MUens6OBORvEiYcazvOoTs7vp0tgbqCbt1tWVjBwidt6ZaF6ips/56vnvkShQ9PpD5tsHolsGR+hl+bkf3gh9evOwS9nCuVo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716190759; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HZPBSH0vjZz69J7K5t3efoAB1M4VqoOB9mDqSM8Zuic=; b=Qx7VS05wd5gotMD1tVwnCNPsu8wIdig0OGDJknx4UKJEFpTCpLTFk00QNbCiYp++RblfNO BsfpWIhGcCsneg0NHes1vjmnbhvPmWBm5l4EEyPEfcSvWUtrPm1ojEUyDqhh63+SJ+PvPi g4IQxUfMQx9IPy4Ine3PJGqXyJsza68= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-oKio9TyjNM-Cd8C_bjI1ow-1; Mon, 20 May 2024 03:39:17 -0400 X-MC-Unique: oKio9TyjNM-Cd8C_bjI1ow-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39E1F3C000B5; Mon, 20 May 2024 07:39:17 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.45.224.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C03EA10004ED; Mon, 20 May 2024 07:39:16 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 44K7dEu63332965 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 20 May 2024 09:39:15 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 44K7dEEI3332964; Mon, 20 May 2024 09:39:14 +0200 Date: Mon, 20 May 2024 09:39:14 +0200 From: Jakub Jelinek To: Tobias Burnus Cc: Richard Biener , gcc-patches Subject: Re: [Patch] contrib/gcc-changelog/git_update_version.py: Improve diagnostic (was: [Patch] contrib/gcc-changelog/git_update_version.py: Add ignore commit, improve diagnostic) Message-ID: Reply-To: Jakub Jelinek References: <85f94d8f-7a25-4000-9243-9e7e814a1e36@baylibre.com> MIME-Version: 1.0 In-Reply-To: <85f94d8f-7a25-4000-9243-9e7e814a1e36@baylibre.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_LOTSOFHASH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Mon, May 20, 2024 at 08:31:02AM +0200, Tobias Burnus wrote: > Hmm, there were now two daily bumps: > > Date:   Mon May 20 00:16:30 2024 +0000 > > Date:   Sun May 19 18:15:28 2024 +0000 > > I really wonder why. Because I've done it by hand. I have in ~gccadmin a gcc-changelog copy and adjusted update_version_git script which doesn't use contrib/gcc-changelog subdirectory from the checkout it makes but from the ~gccadmin directory, because I don't want to constantly try to add some commit number to IGNORED_COMMITS, see that it either works or doesn't (I think sometimes it needs the hash of the revert commit, at other times the commit hash referenced in the revert commit) or that further ones are needed. > From f56b1764f2b5c2c83c6852607405e5be0a763a2c Mon Sep 17 00:00:00 2001 > From: Tobias Burnus > Date: Sun, 19 May 2024 08:17:42 +0200 > Subject: [PATCH] contrib/gcc-changelog/git_update_version.py: Improve diagnostic > > contrib/ChangeLog: > > * gcc-changelog/git_update_version.py (prepend_to_changelog_files): Output 8 spaces rather than tab > git hash in case errors occurred. > > diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py > index 24f6c43d0b2..ec0151b83fe 100755 > --- a/contrib/gcc-changelog/git_update_version.py > +++ b/contrib/gcc-changelog/git_update_version.py > @@ -58,6 +58,7 @@ def read_timestamp(path): > > def prepend_to_changelog_files(repo, folder, git_commit, add_to_git): > if not git_commit.success: > + logging.info(f"While processing {git_commit.info.hexsha}:") > for error in git_commit.errors: > logging.info(error) > raise AssertionError() So, your commit is useful part of it, I'm already using something similar in my hack (just was doing it for even successful commits, but I think your patch is better). And, I think best would be if update_version_git script simply accepted a list of ignored commits from the command line too, passed it to the git_update_version.py script and that one added those to IGNORED_COMMITS. Because typically if the DATESTAMP/ChangeLog updates gets stuck, one doesn't just adjust IGNORED_COMMITS and wait up to another day to see if it worked, but runs the script by hand to make sure it works. --- gcc-checkout/contrib/gcc-changelog/git_update_version.py 2024-05-13 16:52:57.890151748 +0000 +++ gcc-changelog/git_update_version.py 2024-05-19 18:13:44.953648834 +0000 @@ -41,7 +41,21 @@ IGNORED_COMMITS = ( '040e5b0edbca861196d9e2ea2af5e805769c8d5d', '8057f9aa1f7e70490064de796d7a8d42d446caf8', '109f1b28fc94c93096506e3df0c25e331cef19d0', - '39f81924d88e3cc197fc3df74204c9b5e01e12f7') + '39f81924d88e3cc197fc3df74204c9b5e01e12f7', + 'd7bb8eaade3cd3aa70715c8567b4d7b08098e699', + '89feb3557a018893cfe50c2e07f91559bd3cde2b', + 'ccf8d3e3d26c6ba3d5e11fffeed8d64018e9c060', + 'e0c52905f666e3d23881f82dbf39466a24f009f4', + 'b38472ffc1e631bd357573b44d956ce16d94e666', + 'a0b13d0860848dd5f2876897ada1e22e4e681e91', + 'b8c772cae97b54386f7853edf0f9897012bfa90b', + '810d35a7e054bcbb5b66d2e5924428e445f5fba9', + '0df1ee083434ac00ecb19582b1e5b25e105981b2', + '2c688f6afce4cbb414f5baab1199cd525f309fca', + '60dcb710b6b4aa22ea96abc8df6dfe9067f3d7fe', + '44968a0e00f656e9bb3e504bb2fa1a8282002015', + 'd7bb8eaade3cd3aa70715c8567b4d7b08098e699', + 'da73261ce7731be7f2b164f1db796878cdc23365') FORMAT = '%(asctime)s:%(levelname)s:%(name)s:%(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT, @@ -125,6 +139,7 @@ def update_current_branch(ref_name): % (commit.hexsha, head.hexsha), ref_name) commits = [c for c in commits if c.info.hexsha not in IGNORED_COMMITS] for git_commit in reversed(commits): + logging.info('trying %s', git_commit.info.hexsha) prepend_to_changelog_files(repo, args.git_path, git_commit, not args.dry_mode) if args.dry_mode: Jakub