From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpbg153.qq.com (smtpbg153.qq.com [13.245.218.24]) by sourceware.org (Postfix) with ESMTPS id 44ACA3858C2A for ; Tue, 29 Aug 2023 01:43:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 44ACA3858C2A 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: bizesmtp89t1693273393tnclyb9u Received: from [10.101.11.9] ( [113.104.210.73]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 29 Aug 2023 09:43:12 +0800 (CST) X-QQ-SSF: 01400000000000C0F000000A0000000 X-QQ-FEAT: W+onFc5Tw4Mip/sfWly/LCCqGrGteQgNohwpyC0Mev7NR/ywOJaNy9k3n44kP +JCbYHuapaVVU9wR/h/MLy7RpjlpZ/mEf9msgT0aKafCcdOjhvPMsJAaY1eRNbG/SBRQvWh ZdGJuTobIDouBn0r6dYxYvAkKaaGFdnGxWFiSMk1Ln8o3yAWB/DA5E8XUshvbu9UTy0Q1bj PPPgAasadxbkzcMGdvWcy1DFBBcFkX/ZDdfM5nuFzYjX+/NFvtu+mHEc4bhAXhXsQQt9Za7 UDdpz6DCKnrKiVDItl9q/36ADOFMfp5BE85T0IGPlbxEtMe8UJj8ooWxHn+n/0ma0TGYiz7 G+Elamlqa3YsBMqFvk/GxlQIzMkvEQZPIeNs9aJ7TYcQplpXeg= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 3569703214213494592 Content-Type: multipart/mixed; boundary="------------efoUHhIyXwKiLB4uvg9uh9Mh" Message-ID: <8521E3918AD3ADC4+b577ffd2-3483-4b1f-8004-36e6cc8fe317@rivai.ai> Date: Tue, 29 Aug 2023 09:43:12 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mklog: fix bugs of --append option Content-Language: en-US To: Jeff Law , gcc-patches@gcc.gnu.org References: <20230719082126.265155-1-lehua.ding@rivai.ai> From: Lehua Ding In-Reply-To: X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz6a-0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,BODY_8BITS,FORGED_MUA_MOZILLA,GIT_PATCH_0,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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. --------------efoUHhIyXwKiLB4uvg9uh9Mh Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Committed the V2 patch, which additional fix some code format warning, thanks Jeff. On 2023/8/29 7:38, Jeff Law wrote: > > > On 7/19/23 02:21, Lehua Ding wrote: >> 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 `---` > OK.  Sorry for the delay. > jeff > -- Best, Lehua --------------efoUHhIyXwKiLB4uvg9uh9Mh Content-Type: text/plain; charset=UTF-8; name="0001-mklog-fix-bugs-of-append-option-v2.patch" Content-Disposition: attachment; filename="0001-mklog-fix-bugs-of-append-option-v2.patch" Content-Transfer-Encoding: base64 RnJvbSA3YTcyMGRjYmE1ODI2NzRmOTQ0ODZlOTZjMmFiZjliNTQyNzI3ZjkwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBMZWh1YSBEaW5nIDxsZWh1YS5kaW5nQHJpdmFpLmFp PgpEYXRlOiBUdWUsIDE4IEp1bCAyMDIzIDE4OjA4OjQ3ICswODAwClN1YmplY3Q6IFJlOiBb UEFUQ0hdIG1rbG9nOiBmaXggYnVncyBvZiAtLWFwcGVuZCBvcHRpb24KCkhpLAoKVGhpcyBs aXR0bGUgcGF0Y2ggZml4IHR3byBidWdzIG9mIG1rbG9nLnB5IHdpdGggLS1hcHBlbmQgb3B0 aW9uLgpUaGUgZmlyc3QgYnVnIGlzIHRoYXQgdGhlIHJlZ2V4cCB1c2VkIGlzIG5vdCBhY2N1 cmF0ZSBlbm91Z2ggdG8KZGV0ZXJtaW5lIHRoZSB0b3Agb2YgZGlmZiBhcmVhLiBUaGUgc2Vj b25kIGJ1ZyBpcyB0aGF0IGlmIGAtLS1gCmlzIG5vdCBhIHRydWUgc3RhcnQsIGl0IG5lZWRz IHRvIGJlIGFkZGVkIGJhY2sgdG8gdGhlIHBhdGNoIGZpbGUuCkFuZCB3aXRoIGFkZGl0aW9u YWwgZml4IFB5dGhvbiBjb2RlIGZvcm1hdCBlcnJvciwgd2hpY2ggTWFydGluIHJlcG9ydGVk LgoKQmVzdCwKTGVodWEKCmNvbnRyaWIvQ2hhbmdlTG9nOgoKCSogbWtsb2cucHk6IEZpeCBi dWdzLgotLS0KIGNvbnRyaWIvbWtsb2cucHkgfCA4ICsrKysrLS0tCiAxIGZpbGUgY2hhbmdl ZCwgNSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbnRy aWIvbWtsb2cucHkgYi9jb250cmliL21rbG9nLnB5CmluZGV4IDI2MjMwYjliNGYyLi4wYWJl ZmNkOTM3NCAxMDA3NTUKLS0tIGEvY29udHJpYi9ta2xvZy5weQorKysgYi9jb250cmliL21r bG9nLnB5CkBAIC0zNzQsNyArMzc0LDggQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFyZ3MuZmlsbF91cF9idWdf dGl0bGVzLCBhcmdzLnByX251bWJlcnMpCiAgICAgICAgIGlmIGFyZ3MuYXBwZW5kOgogICAg ICAgICAgICAgaWYgKG5vdCBhcmdzLmlucHV0KToKLSAgICAgICAgICAgICAgICByYWlzZSBF eGNlcHRpb24oImAtYSBvciAtLWFwcGVuZGAgb3B0aW9uIG5vdCBzdXBwb3J0IHN0YW5kYXJk IGlucHV0IikKKyAgICAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oImAtYSBvciAtLWFw cGVuZGAgb3B0aW9uIG5vdCBzdXBwb3J0IHN0YW5kYXJkICIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgImlucHV0IikKICAgICAgICAgICAgIGxpbmVzID0gW10KICAgICAg ICAgICAgIHdpdGggb3BlbihhcmdzLmlucHV0LCAncicsIG5ld2xpbmU9J1xuJykgYXMgZjoK ICAgICAgICAgICAgICAgICAjIDEgLT4gbm90IGZpbmQgdGhlIHBvc3NpYmxlIHN0YXJ0IG9m IGRpZmYgbG9nCkBAIC0zODQsMTMgKzM4NSwxNCBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWlu X18nOgogICAgICAgICAgICAgICAgIGZvciBsaW5lIGluIGY6CiAgICAgICAgICAgICAgICAg ICAgIGlmIG1heWJlX2RpZmZfbG9nID09IDEgYW5kIGxpbmUgPT0gIi0tLVxuIjoKICAgICAg ICAgICAgICAgICAgICAgICAgIG1heWJlX2RpZmZfbG9nID0gMgotICAgICAgICAgICAgICAg ICAgICBlbGlmIG1heWJlX2RpZmZfbG9nID09IDIgYW5kIFwKLSAgICAgICAgICAgICAgICAg ICAgICAgICByZS5tYXRjaCgiXHNbXlxzXStccytcfFxzXGQrXHNbK1wtXStcbiIsIGxpbmUp OgorICAgICAgICAgICAgICAgICAgICBlbGlmIChtYXliZV9kaWZmX2xvZyA9PSAyIGFuZAor ICAgICAgICAgICAgICAgICAgICAgICAgICByZS5tYXRjaChyIlxzW15cc10rXHMrXHxccytc ZCtcc1srXC1dK1xuIiwgbGluZSkpOgogICAgICAgICAgICAgICAgICAgICAgICAgbGluZXMg Kz0gW291dHB1dCwgIi0tLVxuIiwgbGluZV0KICAgICAgICAgICAgICAgICAgICAgICAgIG1h eWJlX2RpZmZfbG9nID0gMwogICAgICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAg ICAgICAgICAgICAgICAgIyB0aGUgcG9zc2libGUgc3RhcnQgaXMgbm90IHRoZSB0cnVlIHN0 YXJ0LgogICAgICAgICAgICAgICAgICAgICAgICAgaWYgbWF5YmVfZGlmZl9sb2cgPT0gMjoK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaW5lcy5hcHBlbmQoIi0tLVxuIikKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtYXliZV9kaWZmX2xvZyA9IDEKICAgICAgICAg ICAgICAgICAgICAgICAgIGxpbmVzLmFwcGVuZChsaW5lKQogICAgICAgICAgICAgd2l0aCBv cGVuKGFyZ3MuaW5wdXQsICJ3IikgYXMgZjoKLS0gCjIuMzYuMQoK --------------efoUHhIyXwKiLB4uvg9uh9Mh--