From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 7D1493858288 for ; Tue, 21 May 2024 07:36:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D1493858288 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7D1493858288 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::334 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716276972; cv=none; b=acz8g85PVd+HjfJesyuln23u+xJjSnxLWh722rXNFRS9lkMGmUC2Q6HY4sSQGxvgae2Rpov0Y3jAyUXgQzICgXQbzLZtLEf82yM/lKW0mUMmChzbu3fIsuNgiVwHeCOHWsrU+PwdrpRslELjsZN48U2D2t71UY/C1I+EDPZWHI8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716276972; c=relaxed/simple; bh=WowJ+UPbzOmVorCj9/xr+URE7REAvWXJl5ckXA8N2Pc=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=n2scGdyfNbByyO+RUrwH77ZLfKBo7uXeM2G+xn4ByrNq/6lz4Ah8FYICCNvtDi+AmkgFf2E+8f+Ji9I5y58MJa1RvS9qwDBB6ON1ljui4l5hvcsbONBIIiiMYVPsNXorwQyDikrNdM7lkUv0vp30AE1odi90VIvEsWu8VwlYsUU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-420180b58c5so26122045e9.3 for ; Tue, 21 May 2024 00:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1716276967; x=1716881767; darn=gcc.gnu.org; h=in-reply-to:from:content-language:references:to:subject:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=yGTXK0CJQreem6qCovISeego8wkiJDltXFUNNjFTc4U=; b=k1QYRIXzix+vfoDE97LRzJtwxwTqhhdoo4Nh9kxH0K31yXRXUhyaFOe471K96lKcdm JtBf/ZjOcvGPTfN/B0eX0BRv2/e46GdHEUC+ZszVVXlbNTsWKNtAn+0r9NKh63xM/dxk 1dRWlYckTObcB7oGeRXG0ZlUW28ni16p3k+nw2BYqBtDaKwjjHLwqaMN4x49DPw7HUUD 2d26g3QOLMVf/EPjpvtVHc2paraE8EiHWAGCUMu9iA27mSEeoqT0dvhMDGU16VJq7Ch2 GcSedR4CJyM4IeW9T9MFqZiyb7pV82L6wDltXPvDeiJVzKzT8oHitaya11ACYsHUp+RF p+Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716276967; x=1716881767; h=in-reply-to:from:content-language:references:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=yGTXK0CJQreem6qCovISeego8wkiJDltXFUNNjFTc4U=; b=V2BdjukWFVUa1FUQO0Qz69xm/UVvv+eQLsMbn+MEt+dJoqUR+99/m6EdRPcXCPzZSt 65YQXF03AVdtmvOEgdNjbmwWA2Ot6mgGEm702qOyrqmG/XAoJWpNjCGVwOmeDvxzF8nz H1KWAWavX4bVULzaRc2C4riowCq0dzd0Jq6HESzlCipnU+TdxSzITk4AKfUmwR6yiTGn 7IvmvPgCTfP7y4MDn4IsvR2xV9wrH4P3SCn7dWxZRT3CkFYWjyOPR4IvxbbQEvarmE5+ iFq3b6+YiAvO+ZdgLsuJsc4B59PYqH8k7qUiV7LBDLIErAnTvHVxMb8L5Dp+QStZxyRG stVA== X-Forwarded-Encrypted: i=1; AJvYcCVPvtQ4otx/1xTrc5lppA4Um8AYuwlafuGg96gknWFZInflKMg8B95tqploCmnu2Fhq78FSMRWrZqE75XYp5qRFIA7SPJTA4g== X-Gm-Message-State: AOJu0Yw2I67KwWIoxcGn0jPMGvFjEnk4h+YdUelUIpNOTFgCTJctN0Dp AaPaASeEImN4J6uI7v3iLMj0AB/pmlQ4mEVzEpXV/uqoYOHtPW4FBBptPCIqBOI= X-Google-Smtp-Source: AGHT+IFBvvSYhFx1uRd72B3BMKF7rwwlDViyZrrYTJ0+dO/nhpvriHWWEAZZygtLjMdLKw1+gjcRUQ== X-Received: by 2002:a05:600c:3b88:b0:41b:f534:2381 with SMTP id 5b1f17b1804b1-41feac551camr260574765e9.25.1716276967119; Tue, 21 May 2024 00:36:07 -0700 (PDT) Received: from ?IPV6:2001:16b8:3f5f:a300:dfd2:7b58:64d2:477f? ([2001:16b8:3f5f:a300:dfd2:7b58:64d2:477f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b79bd7asm30862264f8f.17.2024.05.21.00.36.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 May 2024 00:36:06 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------Ft4quP7aTNfZvQwhRJN04Mt0" Message-ID: Date: Tue, 21 May 2024 09:36:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [Patch] contrib/gcc-changelog/git_update_version.py: Improve diagnostic To: Jakub Jelinek , gcc-patches References: <85f94d8f-7a25-4000-9243-9e7e814a1e36@baylibre.com> Content-Language: en-US From: Tobias Burnus In-Reply-To: X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,HTML_MESSAGE,KAM_LOTSOFHASH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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: This is a multi-part message in MIME format. --------------Ft4quP7aTNfZvQwhRJN04Mt0 Content-Type: multipart/alternative; boundary="------------qIU0s6wJJue03Ao8wMHZLmoP" --------------qIU0s6wJJue03Ao8wMHZLmoP Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Jakub, Jakub Jelinek wrote: > On Mon, May 20, 2024 at 08:31:02AM +0200, Tobias Burnus wrote: >> Hmm, there were now two daily bumps: [...] I really wonder why. > Because I've done it by hand. Okay, that explains it. I still do not understand why it slipped through at the first place; I tried old versions down to r12-709-g772e5e82e3114f and it still FAIL for the invalid commit ("ERR: cannot find a ChangeLog location in message"). Thus, I wonder whether the commit hook is active at all?!? > 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, [...] > 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. Updated version: * Uses my diagnostic * Adds an -i/--ignore argument for commits. Permits to use '-i hash1  -i hash2' but also '-i hash1,hash2' or '-i "hash1 hash2' * I changed the global variable to lower case as Python's style guide states that all uppercase variables is for constants. * The '=None' matches one of the current usages (no argument passed); hence, it is now explicit and 'pylint' is happy. OK for mainline? Tobias PS: I have not updated the hashes. If needed/wanted, I leave that to you, Jakub. --------------qIU0s6wJJue03Ao8wMHZLmoP-- --------------Ft4quP7aTNfZvQwhRJN04Mt0 Content-Type: text/x-patch; charset=UTF-8; name="git_update_version-v3.patch" Content-Disposition: attachment; filename="git_update_version-v3.patch" Content-Transfer-Encoding: base64 Y29udHJpYi9nY2MtY2hhbmdlbG9nL2dpdF91cGRhdGVfdmVyc2lvbi5weTog SW1wcm92ZSBkaWFnbm9zdGljCgpjb250cmliL0NoYW5nZUxvZzoKCgkqIGdj Yy1jaGFuZ2Vsb2cvZ2l0X3VwZGF0ZV92ZXJzaW9uLnB5OiBBZGQgJy1pJy8n LS1pZ25vcmUnIGFyZ3VtZW50Cgl0byBhZGQgdG8tYmUtaWdub3JlZCBjb21t aXRzIHZpYSB0aGUgY29tbWFuZCBsaW5lLgoJKGlnbm9yZWRfY29tbWl0cyk6 IFJlbmFtZSBmcm9tIElHTk9SRURfQ09NTUlUUyBhbmQgY2hhbmdlCgl0eXBl IGZyb20gdHVwbGUgdG8gc2V0LgoJKHByZXBlbmRfdG9fY2hhbmdlbG9nX2Zp bGVzKTogU2hvdyBnaXQgaGFzaCBpZiBlcnJvcnMgb2NjdXJyZWQuCgkodXBk YXRlX2N1cnJlbnRfYnJhbmNoKTogTWFyayBhcmd1bWVudCBhcyBvcHRpb25h bCBieSBkZWZhdWx0aW5nCgl0byBOb25lLgoKIGNvbnRyaWIvZ2NjLWNoYW5n ZWxvZy9naXRfdXBkYXRlX3ZlcnNpb24ucHkgfCAxNSArKysrKysrKysrKy0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCA0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbnRyaWIvZ2NjLWNoYW5nZWxvZy9n aXRfdXBkYXRlX3ZlcnNpb24ucHkgYi9jb250cmliL2djYy1jaGFuZ2Vsb2cv Z2l0X3VwZGF0ZV92ZXJzaW9uLnB5CmluZGV4IDI0ZjZjNDNkMGIyLi5jNjlh M2E2ODk3YSAxMDA3NTUKLS0tIGEvY29udHJpYi9nY2MtY2hhbmdlbG9nL2dp dF91cGRhdGVfdmVyc2lvbi5weQorKysgYi9jb250cmliL2djYy1jaGFuZ2Vs b2cvZ2l0X3VwZGF0ZV92ZXJzaW9uLnB5CkBAIC0yMiw2ICsyMiw3IEBAIGlt cG9ydCBhcmdwYXJzZQogaW1wb3J0IGRhdGV0aW1lCiBpbXBvcnQgbG9nZ2lu ZwogaW1wb3J0IG9zCitpbXBvcnQgcmUKIAogZnJvbSBnaXQgaW1wb3J0IFJl cG8KIApAQCAtMzAsNyArMzEsNyBAQCBmcm9tIGdpdF9yZXBvc2l0b3J5IGlt cG9ydCBwYXJzZV9naXRfcmV2aXNpb25zCiBjdXJyZW50X3RpbWVzdGFtcCA9 IGRhdGV0aW1lLmRhdGV0aW1lLm5vdygpLnN0cmZ0aW1lKCclWSVtJWRcbicp CiAKICMgU2tpcCB0aGUgZm9sbG93aW5nIGNvbW1pdHMsIHRoZXkgY2Fubm90 IGJlIGNvcnJlY3RseSBwcm9jZXNzZWQKLUlHTk9SRURfQ09NTUlUUyA9ICgK K2lnbm9yZWRfY29tbWl0cyA9IHsKICAgICAgICAgJ2MyYmU4MjA1OGZiNDBm M2FlODkxYzY4ZDE4NWZmNTNlMDdmMTRmNDUnLAogICAgICAgICAnMDRhMDQw ZDkwN2E4M2FmNTRlMGE5OGJkYmE1YmZhYmMwZWY0ZjcwMCcsCiAgICAgICAg ICcyZTk2YjVmMTRlNDAyNTY5MWI1N2QyMzAxZDcxYWE2MDkyZWQ0NGJjJywK QEAgLTQxLDcgKzQyLDcgQEAgSUdOT1JFRF9DT01NSVRTID0gKAogICAgICAg ICAnMDQwZTViMGVkYmNhODYxMTk2ZDllMmVhMmFmNWU4MDU3NjljOGQ1ZCcs CiAgICAgICAgICc4MDU3ZjlhYTFmN2U3MDQ5MDA2NGRlNzk2ZDdhOGQ0MmQ0 NDZjYWY4JywKICAgICAgICAgJzEwOWYxYjI4ZmM5NGM5MzA5NjUwNmUzZGYw YzI1ZTMzMWNlZjE5ZDAnLAotICAgICAgICAnMzlmODE5MjRkODhlM2NjMTk3 ZmMzZGY3NDIwNGM5YjVlMDFlMTJmNycpCisgICAgICAgICczOWY4MTkyNGQ4 OGUzY2MxOTdmYzNkZjc0MjA0YzliNWUwMWUxMmY3J30KIAogRk9STUFUID0g JyUoYXNjdGltZSlzOiUobGV2ZWxuYW1lKXM6JShuYW1lKXM6JShtZXNzYWdl KXMnCiBsb2dnaW5nLmJhc2ljQ29uZmlnKGxldmVsPWxvZ2dpbmcuSU5GTywg Zm9ybWF0PUZPUk1BVCwKQEAgLTU4LDYgKzU5LDcgQEAgZGVmIHJlYWRfdGlt ZXN0YW1wKHBhdGgpOgogCiBkZWYgcHJlcGVuZF90b19jaGFuZ2Vsb2dfZmls ZXMocmVwbywgZm9sZGVyLCBnaXRfY29tbWl0LCBhZGRfdG9fZ2l0KToKICAg ICBpZiBub3QgZ2l0X2NvbW1pdC5zdWNjZXNzOgorICAgICAgICBsb2dnaW5n LmluZm8oZiJXaGlsZSBwcm9jZXNzaW5nIHtnaXRfY29tbWl0LmluZm8uaGV4 c2hhfToiKQogICAgICAgICBmb3IgZXJyb3IgaW4gZ2l0X2NvbW1pdC5lcnJv cnM6CiAgICAgICAgICAgICBsb2dnaW5nLmluZm8oZXJyb3IpCiAgICAgICAg IHJhaXNlIEFzc2VydGlvbkVycm9yKCkKQEAgLTkzLDEzICs5NSwxNSBAQCBw YXJzZXIuYWRkX2FyZ3VtZW50KCctZCcsICctLWRyeS1tb2RlJywKICAgICAg ICAgICAgICAgICAgICAgICAgICAnIGlzIGV4cGVjdGVkJykKIHBhcnNlci5h ZGRfYXJndW1lbnQoJy1jJywgJy0tY3VycmVudCcsIGFjdGlvbj0nc3RvcmVf dHJ1ZScsCiAgICAgICAgICAgICAgICAgICAgIGhlbHA9J01vZGlmeSBjdXJy ZW50IGJyYW5jaCAoLS1wdXNoIGFyZ3VtZW50IGlzIGlnbm9yZWQpJykKK3Bh cnNlci5hZGRfYXJndW1lbnQoJy1pJywgJy0taWdub3JlJywgYWN0aW9uPSdh cHBlbmQnLAorICAgICAgICAgICAgICAgICAgICBoZWxwPSdsaXN0IG9mIGNv bW1pdHMgdG8gaWdub3JlJykKIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygp CiAKIHJlcG8gPSBSZXBvKGFyZ3MuZ2l0X3BhdGgpCiBvcmlnaW4gPSByZXBv LnJlbW90ZXNbJ29yaWdpbiddCiAKIAotZGVmIHVwZGF0ZV9jdXJyZW50X2Jy YW5jaChyZWZfbmFtZSk6CitkZWYgdXBkYXRlX2N1cnJlbnRfYnJhbmNoKHJl Zl9uYW1lPU5vbmUpOgogICAgIGNvbW1pdCA9IHJlcG8uaGVhZC5jb21taXQK ICAgICBjb21taXRfY291bnQgPSAxCiAgICAgd2hpbGUgY29tbWl0OgpAQCAt MTIzLDcgKzEyNyw3IEBAIGRlZiB1cGRhdGVfY3VycmVudF9icmFuY2gocmVm X25hbWUpOgogICAgICAgICAgICAgaGVhZCA9IGhlYWQucGFyZW50c1sxXQog ICAgICAgICBjb21taXRzID0gcGFyc2VfZ2l0X3JldmlzaW9ucyhhcmdzLmdp dF9wYXRoLCAnJXMuLiVzJwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAlIChjb21taXQuaGV4c2hhLCBoZWFkLmhleHNoYSksIHJl Zl9uYW1lKQotICAgICAgICBjb21taXRzID0gW2MgZm9yIGMgaW4gY29tbWl0 cyBpZiBjLmluZm8uaGV4c2hhIG5vdCBpbiBJR05PUkVEX0NPTU1JVFNdCisg ICAgICAgIGNvbW1pdHMgPSBbYyBmb3IgYyBpbiBjb21taXRzIGlmIGMuaW5m by5oZXhzaGEgbm90IGluIGlnbm9yZWRfY29tbWl0c10KICAgICAgICAgZm9y IGdpdF9jb21taXQgaW4gcmV2ZXJzZWQoY29tbWl0cyk6CiAgICAgICAgICAg ICBwcmVwZW5kX3RvX2NoYW5nZWxvZ19maWxlcyhyZXBvLCBhcmdzLmdpdF9w YXRoLCBnaXRfY29tbWl0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbm90IGFyZ3MuZHJ5X21vZGUpCkBAIC0xNTMsNiArMTU3 LDkgQEAgZGVmIHVwZGF0ZV9jdXJyZW50X2JyYW5jaChyZWZfbmFtZSk6CiAg ICAgZWxzZToKICAgICAgICAgbG9nZ2luZy5pbmZvKCdEQVRFU1RBTVAgdW5j aGFuZ2VkJykKIAoraWYgYXJncy5pZ25vcmUgaXMgbm90IE5vbmU6CisgICAg Zm9yIGl0ZW0gaW4gYXJncy5pZ25vcmU6CisgICAgICAgIGlnbm9yZWRfY29t bWl0cy51cGRhdGUoc2V0KGkgZm9yIGkgaW4gcmUuc3BsaXQocidccyosXHMq fFxzKycsIGl0ZW0pKSkKIAogaWYgYXJncy5jdXJyZW50OgogICAgIGxvZ2dp bmcuaW5mbygnPT09IFdvcmtpbmcgb24gdGhlIGN1cnJlbnQgYnJhbmNoID09 PScpCg== --------------Ft4quP7aTNfZvQwhRJN04Mt0--