From patchwork Mon Dec 12 12:25:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 32346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2212870wrr; Mon, 12 Dec 2022 04:28:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4wCQYMD02GDsYpvNdrq4o1HUsXa+yUwzWV/Zmde0Evl6AQeoe9yfrCgu27abTBCud0zlPv X-Received: by 2002:a17:907:8d16:b0:7c1:5098:907a with SMTP id tc22-20020a1709078d1600b007c15098907amr8427769ejc.35.1670848119969; Mon, 12 Dec 2022 04:28:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670848119; cv=none; d=google.com; s=arc-20160816; b=AuWcD5skdZ8mFv1lSBHqfHaOoON6ENayZJZqdd5N2nABfrO8YqQweHyYTp8ftoPfcc tFIdmB1eD5FRx7Ax0cO1YOermJLSUJyRrhF0kEv0ZRAYnM8zIUIotyjiGKrSqu5YVnlS UILUxRoFgwDw2boO/nZoM5DDJCuqgmZKfdo45uUqAvrGOEw/rv9Dg+8Eb8YY6cu0s9BW HYYBdq2XfWd671CUYpvITdYRTLrWouV14FUFSjX3xxWMX59FHXUHKbobCsjfvIDL2h94 Nu99sT0Q/Bp5yCdsQxhYZTd7dzOukDlnIj11b2E3CrlAnZR1L19mfWbzhwf8q8hH3Tal qxag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding:cc :content-language:to:subject:from:user-agent:mime-version:date :message-id:dkim-signature:dkim-signature:dmarc-filter:delivered-to; bh=p1d7c2tSRlxjYVE3PNj2qBA8Aid4KwF4NKM9nmSJmXA=; b=hGneyf2OA1oLi22u4z2b22N57qAOpwWgfy8VoQ9oMhuJDRzHie3w8XoLMqRf80uTV1 bFVeQfyTScoo+7XbxHIssOU1HXI49gMG3e3e8nK5DxNOvZRmcjdXfBXzwrnOW6V/ENw4 1C/UZBFad04g84NayLXcNY3ac+ziTn+g5p/pLbInQ44PQfqARBqifIBPr22j94hl0Spw HL2CR2BGkU6UxZhZIhaqQ0NgfnGk/hF7TgxN24lhd8+uHllzgUy/d+JObWsagInxgCF3 lN4wvmaX9KAU333i5VLlVLRfwDFhr+hIFAkOSvCfzyokOHXZlcPrAu63mlsoyNNiRvds q5Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=luT4q37o; dkim=neutral (no key) header.i=@gcc.gnu.org header.s=susede2_ed25519 header.b=cBFEdwZO; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i23-20020a170906851700b007a20c586f4esi4388439ejx.876.2022.12.12.04.28.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 04:28:39 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=luT4q37o; dkim=neutral (no key) header.i=@gcc.gnu.org header.s=susede2_ed25519 header.b=cBFEdwZO; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5275E3939E34 for ; Mon, 12 Dec 2022 12:25:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 4638C3872574 for ; Mon, 12 Dec 2022 12:25:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4638C3872574 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 533AB20DA5; Mon, 12 Dec 2022 12:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1670847922; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1d7c2tSRlxjYVE3PNj2qBA8Aid4KwF4NKM9nmSJmXA=; b=luT4q37o9VlFiL0yCnBPh83Mu/YrZu6ED0GGA/DpEoCJJTVBxi1237ox/xnB4X0I0a7yWN MVWxqvifpxA0mD7hZmpwyMJ6HMEJYg/IVJiVsxl2zHvY1J0fGf4DP0pcMerFuX9lVJiImx BjCsaIeedZB+OtEry0VjnTKpL9IcLf0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1670847922; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1d7c2tSRlxjYVE3PNj2qBA8Aid4KwF4NKM9nmSJmXA=; b=cBFEdwZOV6RS12oLpNhlir+RAGm0fZiDwYpX1ilIYj2v0EzmhP310zrSSVLPFbCLyiYJL+ Y3DXSGDndgh8XEAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 40D14138F3; Mon, 12 Dec 2022 12:25:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id geTLDrIdl2NPfAAAMHmgww (envelope-from ); Mon, 12 Dec 2022 12:25:22 +0000 Message-ID: Date: Mon, 12 Dec 2022 13:25:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH (pushed)] mklog: do not parse binary file for PR entry To: gcc-patches@gcc.gnu.org Content-Language: en-US Cc: Thomas Schwinge X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752011238357351497?= X-GMAIL-MSGID: =?utf-8?q?1752011238357351497?= contrib/ChangeLog: * mklog.py: Do not search PR entry in a file that is binary. --- contrib/mklog.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/contrib/mklog.py b/contrib/mklog.py index 3a6ec681b65..358b7fc6b8b 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -186,23 +186,25 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, # contains commented code which a note that it # has not been tested due to a certain PR or DR. this_file_prs = [] - for line in list(file)[0][0:10]: - m = pr_regex.search(line.value) - if m: - pr = m.group('pr') - if pr not in prs: - prs.append(pr) - this_file_prs.append(pr.split('/')[-1]) - else: - m = dr_regex.search(line.value) + if not file.is_binary_file: + for line in list(file)[0][0:10]: + m = pr_regex.search(line.value) if m: - dr = m.group('dr') - if dr not in prs: - prs.append(dr) - this_file_prs.append(dr.split('/')[-1]) - elif dg_regex.search(line.value): - # Found dg-warning/dg-error line - break + pr = m.group('pr') + if pr not in prs: + prs.append(pr) + this_file_prs.append(pr.split('/')[-1]) + else: + m = dr_regex.search(line.value) + if m: + dr = m.group('dr') + if dr not in prs: + prs.append(dr) + this_file_prs.append(dr.split('/')[-1]) + elif dg_regex.search(line.value): + # Found dg-warning/dg-error line + break + # PR number in the file name fname = os.path.basename(file.path) m = pr_filename_regex.search(fname)