From 7a720dcba582674f94486e96c2abf9b542727f90 Mon Sep 17 00:00:00 2001 From: Lehua Ding 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