From patchwork Wed Jul 19 08:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lehua Ding X-Patchwork-Id: 122449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2283514vqt; Wed, 19 Jul 2023 01:22:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlGEUE0kLnbrgWPHTSIlHMyNvuh+OFwr9FXEgZQPHx2YNnkKig6TxrbzTJa7slmlELnXAEYr X-Received: by 2002:a17:906:8a6e:b0:98e:419b:4cbc with SMTP id hy14-20020a1709068a6e00b0098e419b4cbcmr1538491ejc.12.1689754946920; Wed, 19 Jul 2023 01:22:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754946; cv=none; d=google.com; s=arc-20160816; b=Z38ZAY/wlZdJd5Xj0OQJjYg+/9WIjjGhX33hbAz5WK4gyysbaBE10RsdGDPNbSYgma i1lLISYVunvoaRjmVFXKiVx8/dDeLSJKbNPRQNbYLrchlfqEHI7d3Ee8X2f4luAPHDQb DAxqSZhDUEUwt420xGbtfBBiYG610fqTX7IfyfxFDhDMizDHxsViedpkCmGsZw5SXZV6 qXYDTgPYU+u9uimG+2kfM8tnEvk8XLpWST6oNRoBZzqrKpScfpeAEz3yWGlc5ybDwqHr NwnTKEQe1Q3IAhxotGfoS6fNRjeX5qv/2cd/OYkd/2fDXZYUR9UJGD2QYGmfwANm5/d9 yWkw== 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:feedback-id :content-transfer-encoding:mime-version:message-id:date:subject:to :from:dmarc-filter:delivered-to; bh=GD1QQUdvXk2mz8xf/pUcBQByqE184LjFEoxVdYvGGyA=; fh=P8pYutX4sfLWUPYhY4z59ZjRrceNHB4U61OT/cnAeTE=; b=nhuEjSs7M43RXcbJt2AU+3pcSdM8cUwJJs2UYdy0WeBPw4MjsjOj4FlZDYBRQpdmxK 9hvW+cyyOXu9ihBKVqlsEMdpnD/+jWpmIRggmcuBvKa+HT0vzXyw64xCjQz5hI0Ero+J WQp8BofAPDHI/Vd7AastQ3MZgDH/+BR4VB+AIDgaexQj2GEBcdNYkAaqOfzwIBRAk+cy sZRG50CWU9o0ly0yu0f0YwcBzakI+bFk1Kjy8KenTLD3rhPaa9m1IA2oHUQTn+16z3uU wvSxeomtH++UQB1+a5x4/lNYj6WpDQ68TOn0CDkUj880TrkWW7E4noaoIgaT9OA0Fz7x H1Kw== ARC-Authentication-Results: i=1; mx.google.com; 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id u17-20020a1709064ad100b0098947f89083si2645611ejt.390.2023.07.19.01.22.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 01:22:26 -0700 (PDT) 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; 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 037193858C39 for ; Wed, 19 Jul 2023 08:22:04 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbg153.qq.com (smtpbg153.qq.com [13.245.218.24]) by sourceware.org (Postfix) with ESMTPS id 397C73858039 for ; Wed, 19 Jul 2023 08:21:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 397C73858039 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai X-QQ-mid: bizesmtp69t1689754888t62km47w Received: from server1.localdomain ( [58.60.1.22]) by bizesmtp.qq.com (ESMTP) with SMTP id 0 for ; Wed, 19 Jul 2023 16:21:27 +0800 (CST) X-QQ-SSF: 01400000000000B0F000000A0000000 X-QQ-FEAT: 5q30pvLz2icDCFqANGtCViHppmlghwl/JcpiMiTDmOOYVlRkoM6dGl38D/tro eWUJUqcLJj3AtgqlmWQIsVc7751jwDX5k9hMQGBWC/GINt5q7u2RoF5uMnnSLHLf/Nv9LRf SmAmaPOiWKzdxZiL6sW5hjbwfL20fhurrScO3qYKc0cyE8rUhS31i4tIkAGl56WidB5iLAX NNkyfNTFGMOA5R6N/+zzvWAcOeHuB1nVTvnhj78hE+RcL8+9IAaD/rENpxKhbJl+OtqYSap s6sZw1nRLhk/nEwMH85rLwDLb7vvFuQXi76N2HHwXntP5voNHydBw5tUee1KYdG2mxxKmpy bbWVrlVxDCwrKgY5lF4HGxnC4/8AFsY+N5ddU+C6XcPjxepO+HdU4o0IWc2aQ== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 14076837271797233529 From: Lehua Ding To: gcc-patches@gcc.gnu.org Subject: [PATCH] mklog: fix bugs of --append option Date: Wed, 19 Jul 2023 16:21:26 +0800 Message-Id: <20230719082126.265155-1-lehua.ding@rivai.ai> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz6a-0 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771836483100664254 X-GMAIL-MSGID: 1771836483100664254 Hi, This little patch fix two bugs of mklog.py with --append option. The first bug is that the regexp used is not accurate enough to determine the top of diff area. The second bug is that if `---` is not a true start, it needs to be added back to the patch file. contrib/ChangeLog: * mklog.py: Fix regexp and add missed `---` --- contrib/mklog.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/mklog.py b/contrib/mklog.py index 26230b9b4f2..bd81c5ba92c 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -385,12 +385,13 @@ if __name__ == '__main__': if maybe_diff_log == 1 and line == "---\n": maybe_diff_log = 2 elif maybe_diff_log == 2 and \ - re.match("\s[^\s]+\s+\|\s\d+\s[+\-]+\n", line): + re.match("\s[^\s]+\s+\|\s+\d+\s[\+\-]+\n", line): lines += [output, "---\n", line] maybe_diff_log = 3 else: # the possible start is not the true start. if maybe_diff_log == 2: + lines.append("---\n") maybe_diff_log = 1 lines.append(line) with open(args.input, "w") as f: