* [PATCH] mklog: fix bugs of --append option @ 2023-07-19 8:21 Lehua Ding 2023-07-26 6:30 ` Lehua Ding 2023-08-28 23:38 ` Jeff Law 0 siblings, 2 replies; 6+ messages in thread From: Lehua Ding @ 2023-07-19 8:21 UTC (permalink / raw) To: gcc-patches 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mklog: fix bugs of --append option 2023-07-19 8:21 [PATCH] mklog: fix bugs of --append option 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 1 sibling, 2 replies; 6+ messages in thread From: Lehua Ding @ 2023-07-26 6:30 UTC (permalink / raw) To: gcc-patches; +Cc: juzhe.zhong, jeffreyalaw, mjambor Hi, Gentle Ping. I sent a V2 patch as below for an additional fix Python code format error, which Martin reported, thanks. 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mklog: fix bugs of --append option 2023-07-26 6:30 ` Lehua Ding @ 2023-08-16 5:10 ` Lehua Ding 2023-08-22 3:09 ` PING^^^^ " Lehua Ding 1 sibling, 0 replies; 6+ messages in thread From: Lehua Ding @ 2023-08-16 5:10 UTC (permalink / raw) To: Jeff Law; +Cc: juzhe.zhong, mjambor, gcc-patches [-- Attachment #1: Type: text/plain, Size: 3282 bytes --] Hi Jeff, Can you take a look at this little patch? It's a bugfix patch that only affects the --apend option that I added earlier, not anyone else. And please let me know if there is a more suitable reviewer as well. Thank you so much. Best, Lehua ------------------ Original ------------------ From: "Lehua Ding" <lehua.ding@rivai.ai>; Date: Wed, Jul 26, 2023 02:30 PM To: "gcc-patches"<gcc-patches@gcc.gnu.org>; Cc: "juzhe.zhong"<juzhe.zhong@rivai.ai>;"jeffreyalaw"<jeffreyalaw@gmail.com>;"mjambor"<mjambor@suse.cz>; Subject: Re: [PATCH] mklog: fix bugs of --append option Hi, Gentle Ping. I sent a V2 patch as below for an additional fix Python code format error, which Martin reported, thanks. 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PING^^^^ [PATCH] mklog: fix bugs of --append option 2023-07-26 6:30 ` Lehua Ding 2023-08-16 5:10 ` Lehua Ding @ 2023-08-22 3:09 ` Lehua Ding 1 sibling, 0 replies; 6+ messages in thread From: Lehua Ding @ 2023-08-22 3:09 UTC (permalink / raw) To: gcc-patches Gentle ping this little fix patch. Can anyone help review this patch? Thanks in advance. Best, Lehua On 2023/7/26 14:30, Lehua Ding wrote: > Hi, > > Gentle Ping. > > I sent a V2 patch as below for an additional fix Python code format error, > which Martin reported, thanks. > > 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: -- Best, Lehua ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mklog: fix bugs of --append option 2023-07-19 8:21 [PATCH] mklog: fix bugs of --append option Lehua Ding 2023-07-26 6:30 ` Lehua Ding @ 2023-08-28 23:38 ` Jeff Law 2023-08-29 1:43 ` Lehua Ding 1 sibling, 1 reply; 6+ messages in thread From: Jeff Law @ 2023-08-28 23:38 UTC (permalink / raw) To: Lehua Ding, gcc-patches 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mklog: fix bugs of --append option 2023-08-28 23:38 ` Jeff Law @ 2023-08-29 1:43 ` Lehua Ding 0 siblings, 0 replies; 6+ messages in thread From: Lehua Ding @ 2023-08-29 1:43 UTC (permalink / raw) To: Jeff Law, gcc-patches [-- 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-29 1:43 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-07-19 8:21 [PATCH] mklog: fix bugs of --append option 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 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).