From: Lehua Ding <lehua.ding@rivai.ai>
To: Jeff Law <jeffreyalaw@gmail.com>, gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] mklog: fix bugs of --append option
Date: Tue, 29 Aug 2023 09:43:12 +0800 [thread overview]
Message-ID: <8521E3918AD3ADC4+b577ffd2-3483-4b1f-8004-36e6cc8fe317@rivai.ai> (raw)
In-Reply-To: <bbf14484-3c67-b2c6-e35a-7e128d2daf63@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
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
[-- Attachment #2: 0001-mklog-fix-bugs-of-append-option-v2.patch --]
[-- Type: text/plain, Size: 2253 bytes --]
From 7a720dcba582674f94486e96c2abf9b542727f90 Mon Sep 17 00:00:00 2001
From: Lehua Ding <lehua.ding@rivai.ai>
Date: Tue, 18 Jul 2023 18:08:47 +0800
Subject: Re: [PATCH] mklog: fix bugs of --append option
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.
And with additional fix Python code format error, which Martin reported.
Best,
Lehua
contrib/ChangeLog:
* mklog.py: Fix bugs.
---
contrib/mklog.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/mklog.py b/contrib/mklog.py
index 26230b9b4f2..0abefcd9374 100755
--- a/contrib/mklog.py
+++ b/contrib/mklog.py
@@ -374,7 +374,8 @@ if __name__ == '__main__':
args.fill_up_bug_titles, args.pr_numbers)
if args.append:
if (not args.input):
- raise Exception("`-a or --append` option not support standard input")
+ raise Exception("`-a or --append` option not support standard "
+ "input")
lines = []
with open(args.input, 'r', newline='\n') as f:
# 1 -> not find the possible start of diff log
@@ -384,13 +385,14 @@ if __name__ == '__main__':
for line in f:
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):
+ elif (maybe_diff_log == 2 and
+ re.match(r"\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:
--
2.36.1
prev parent reply other threads:[~2023-08-29 1:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 8:21 Lehua Ding
2023-07-26 6:30 ` Lehua Ding
2023-08-16 5:10 ` Lehua Ding
2023-08-22 3:09 ` PING^^^^ " Lehua Ding
2023-08-28 23:38 ` Jeff Law
2023-08-29 1:43 ` Lehua Ding [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8521E3918AD3ADC4+b577ffd2-3483-4b1f-8004-36e6cc8fe317@rivai.ai \
--to=lehua.ding@rivai.ai \
--cc=gcc-patches@gcc.gnu.org \
--cc=jeffreyalaw@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).