From: Lehua Ding <lehua.ding@rivai.ai>
To: gcc-patches@gcc.gnu.org
Subject: [PATCH] mklog: fix bugs of --append option
Date: Wed, 19 Jul 2023 16:21:26 +0800 [thread overview]
Message-ID: <20230719082126.265155-1-lehua.ding@rivai.ai> (raw)
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:
--
2.36.1
next reply other threads:[~2023-07-19 8:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 8:21 Lehua Ding [this message]
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
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=20230719082126.265155-1-lehua.ding@rivai.ai \
--to=lehua.ding@rivai.ai \
--cc=gcc-patches@gcc.gnu.org \
/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).